summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-02-05reconcile main tree with open-source eclairandroid-sdk-tools_r5android-cts-2.1_r5android-cts-2.1_r4android-cts-2.1_r3android-cts-2.1_r2eclairThe Android Open Source Project
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project
2010-01-11empty initial commitThe Android Open Source Project
2009-10-08am bf2ddef8: (-s ours) Import revised translations. DO NOT MERGEandroid-sdk-tools_r4android-sdk-tools_r3android-sdk-2.1_r1android-sdk-2.0_r1android-sdk-2.0.1_r1android-sdk-2.0.1-docs_r1android-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1android-2.0_r1android-2.0.1_r1eclair-sholes-release2eclair-sholes-releaseeclair-releaseeclair-passion-releaseEric Fischer
Merge commit 'bf2ddef873860c6ac11fde269d9eb40fe4f47893' into eclair * commit 'bf2ddef873860c6ac11fde269d9eb40fe4f47893': Import revised translations. DO NOT MERGE
2009-09-29Import revised translations. DO NOT MERGEHEADandroid-sdk-1.6_r2android-1.6_r2mastermaindonut-releaseEric Fischer
2009-09-20Delete ImProviderJean-Baptiste Queru
It was becoming too Google-specific to make sense on the open-source side of things. BUG=2116370
2009-09-17Import revised translations. DO NOT MERGEEric Fischer
2009-09-11Moving ImProvider to TalkProvider: stop compiling ImProviderYe Wen
2009-09-08Import revised translations. DO NOT MERGEEric Fischer
2009-09-07fix ImProvider upgrade path from version 47 to 52.Wei Huang
Change-Id: I984b1df86470e0a5a9aa043d4ece21d44dedc7e0
2009-08-27Handle chat by account query for chat pruning.Ye Wen
2009-08-26resolved conflicts for merge of 6c4e2156 to eclairWei Huang
Change-Id: I1979cb587ef084bbf03cb34a9095c8c017be2a99
2009-08-26run IM provider in gapps process instead of acore, so everything ↵android-sdk-tools_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1donut-release2Wei Huang
GTalkService needs to run as a persistent service lives inside a single process. This hopefully relieves some memory pressure in Donut. The negative side effect of this is when the user upgrade to Donut, he will lose his old IM storage, which in Donut contains any account username/pw for AIM/Yahoo/MSN, the provider settings (i.e. auto-login, notification ringtones, etc), and the outgoing RMQ messages not yet received by MCS. The amount of data lost is not significant and can all be recovered by the user. It's not he will lost chat messages because we don't store those in persistent storage in Donut. The things done to make IM provider running in gapps are: - make IM provider use the google uid. - make it run in the process "com.google.process.gapps" - in the make file, make it use "vendor/google/certs/app" certificate.
2009-08-22Move the landing page to IM application and remove the depency of ↵Scott Su
com.android.im.plugin.jar Some other tiny changes: - Allows the client to delete providersettings records through uri "content://im/providerSettings/#" - Allows the client to get account.keep_signed_in when query the active account with given provider.
2009-08-21add a "show_ts" column to the message tables (both disk and memory based ↵Wei Huang
tables). Provide upgrade path.
2009-08-06new s2d ids table for rmq2Wei Huang
2009-08-04merge from open-source masterJean-Baptiste Queru
2009-08-03am 4b585115: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit '4b58511592ea9c6d20a522246bbe00f8bee13877' * commit '4b58511592ea9c6d20a522246bbe00f8bee13877': Import revised translations. DO NOT MERGE
2009-08-03Import revised translations. DO NOT MERGEEric Fischer
2009-07-29merge from donutJean-Baptiste Queru
2009-07-26reconcile korg/master into goog/masterJean-Baptiste Queru
2009-07-25Merge korg/donut into korg/masterJean-Baptiste Queru
2009-07-23mods to support chat clearing for group chatsMark Wagner
2009-07-16am 9d6f85f0: Fix ImProvider makefile so tests source are not included when ↵Brett Chabot
building Improvider package. Merge commit '9d6f85f0aa19d210cec631b55428ee3b2b9b1036' * commit '9d6f85f0aa19d210cec631b55428ee3b2b9b1036': Fix ImProvider makefile so tests source are not included when building Improvider package.
2009-07-16Fix ImProvider makefile so tests source are not included when building ↵Brett Chabot
Improvider package.
2009-07-14Merge commit 'goog/readonly-korg-master' into merge_korg_masterJean-Baptiste Queru
2009-07-13am f0cd2abf: Import new translationsEric Fischer
Merge commit 'f0cd2abf0fac2e6cbf19428402bc26609e1152db' * commit 'f0cd2abf0fac2e6cbf19428402bc26609e1152db': Import new translations
2009-07-13Import new translationsEric Fischer
2009-07-07Bug 1963517: remove the IM app icon from the app launcher by default. ↵Wei Huang
Verizon cannot ship the current IM app as is. They will either not ship IM, or contract to get their own IM plugin apk.
2009-06-17am 51823c08: Add permission test for im provider.Brett Chabot
Merge commit '51823c086b4af424aa0882315fe20deedc897a4e' * commit '51823c086b4af424aa0882315fe20deedc897a4e': Add permission test for im provider.
2009-06-17Add permission test for im provider.Brett Chabot
2009-05-21Fix and refactor sqlite statements for IM database.Wei Huang
2009-05-21handle OTR messages by storing them in a in-memory messages table; remove ↵Wei Huang
groupchat specific urls, we can do everything by thread ids. - create in-memory messages table to store the off-the-record messages. - inserting, deleting, updating off-the-record messages use different urls, which allows us to use the in-memory messages table; querying the messages would do an union query on both persistent and in-memory messages tables.
2009-05-05Merge branch 'readonly-p4-master'Brandon Ballinger
2009-05-05AI 148348: New UI for voice input method, courtesy of BillB.Brandon Ballinger
- New layout and graphics for microphone, waveform, starting up, error message. - Better error handling. - More responsive to microphone input. Automated import of CL 148348
2009-04-30am e928855: am 30b89c4: AI 148026: Update zh_TW translations.Eric Fischer
Merge commit 'e9288557fafb8594c70ac6de0f362c08a8b3fe10' * commit 'e9288557fafb8594c70ac6de0f362c08a8b3fe10': AI 148026: Update zh_TW translations.
2009-04-30am 30b89c4: AI 148026: Update zh_TW translations.Eric Fischer
Merge commit '30b89c4a8abb86aa62149c5b2cecce2acacf05ef' into donut * commit '30b89c4a8abb86aa62149c5b2cecce2acacf05ef': AI 148026: Update zh_TW translations.
2009-04-30AI 148026: Update zh_TW translations.android-sdk-1.5_r3android-1.5r4android-1.5r3cupcake-releaseEric Fischer
Automated import of CL 148026
2009-04-29store contact id in messages table instead of the contact name string; merge ↵Wei Huang
messages and group messages table. - merge group messages table with the messages table. - replace the columns 'provider', 'account', 'contact' with 'thread_id' column in the messages table. The thread_id column really contains the contact id for both messages and group messages. - when querying for messages, use joined table b/t messages and contacts, so we can get the contact name with the query. This is really for finding messages given a contact name, with the selection equal to "contacts.account=? AND contacts.USERNAME=?". - added uri "content://im/messagesByThreadId", "content://im/messagesByProvider", etc. - reinstated the contact cleanup triggers to remove chats and messages. This was taken out because GTalkService wipes out the old contacts and re-insert new roster result, causing the onging chats to be deleted. I changed the way GTalkService updates contacts when getting a roster result on reconnect, and it's no longer destructive.
2009-04-27remove db trigger to delete chats when a contact is deleted.Wei Huang
The trigger would cause a bug where all chats are removed when we sync the roster from mcs during a reconnect, because we delete all old contacts and insert the new contacts.
2009-04-24Merge commit 'korg/donut'The Android Open Source Project
2009-04-24make IM messages and chats persistent in the database.Wei Huang
They used to be in memory portion of the database, and are wiped when the device reboots or the android.acore process dies. We are trying to make them more resilient to process dying, as well as trying to retain longer message history. updated database version, implemented upgrade path (creating Messages and Chats tables in persistent store). added back the trigger to delete chat when a contact is deleted.
2009-04-22Merge donut into masterJean-Baptiste Queru
2009-04-22merge cupcake into donutJean-Baptiste Queru
2009-04-22Merge donut into masterJean-Baptiste Queru
2009-04-14Merge commit 'korg/cupcake'The Android Open Source Project
2009-04-13AI 146037: Import updated translations.android-sdk-1.5_r1android-1.5r2android-1.5Eric Fischer
Automated import of CL 146037
2009-04-13AI 145854: am: CL 145547 - make the default build configuration to *not* ↵Wei Huang
include the IM app, and don't show the IM landing page activity. Override the kila_us build (in tmus_overlay) to include the IM app and enable the landing page activity. this is in response to Keva asking to take IM app out of Opal. The result is that only Kila_us build has IM app. Since it's the only, it seems reasonable to make the default *not* include IM app. - clean up some old obsolete stuff in the mk files. GTalkSettings isn't present anymore and was never present in 1.0 release. Original author: weih Merged from: //branches/cupcake/... Automated import of CL 145854
2009-04-10AI 145782: Import updated translations.Eric Fischer
DO NOT MERGE Automated import of CL 145782