OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
The Android Open Source Project [Fri, 5 Feb 2010 16:09:41 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 29 Jan 2010 22:09:29 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
The Android Open Source Project [Tue, 12 Jan 2010 23:19:23 +0000 (15:19 -0800)]
android-2.1_r1 snapshot
The Android Open Source Project [Mon, 11 Jan 2010 23:29:34 +0000 (15:29 -0800)]
empty initial commit
Eric Fischer [Thu, 8 Oct 2009 21:59:55 +0000 (14:59 -0700)]
am
bf2ddef8: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
bf2ddef873860c6ac11fde269d9eb40fe4f47893' into eclair
* commit '
bf2ddef873860c6ac11fde269d9eb40fe4f47893':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Sep 2009 23:46:09 +0000 (16:46 -0700)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Sun, 20 Sep 2009 18:32:08 +0000 (11:32 -0700)]
Delete ImProvider
It was becoming too Google-specific to make sense
on the open-source side of things.
BUG=
2116370
Eric Fischer [Thu, 17 Sep 2009 21:38:15 +0000 (14:38 -0700)]
Import revised translations. DO NOT MERGE
Ye Wen [Fri, 11 Sep 2009 18:47:35 +0000 (11:47 -0700)]
Moving ImProvider to TalkProvider: stop compiling ImProvider
Eric Fischer [Tue, 8 Sep 2009 23:33:28 +0000 (16:33 -0700)]
Import revised translations. DO NOT MERGE
Wei Huang [Sat, 5 Sep 2009 09:15:13 +0000 (02:15 -0700)]
fix ImProvider upgrade path from version 47 to 52.
Change-Id: I984b1df86470e0a5a9aa043d4ece21d44dedc7e0
Ye Wen [Thu, 27 Aug 2009 16:01:05 +0000 (09:01 -0700)]
Handle chat by account query for chat pruning.
Wei Huang [Thu, 27 Aug 2009 05:49:59 +0000 (22:49 -0700)]
resolved conflicts for merge of
6c4e2156 to eclair
Change-Id: I1979cb587ef084bbf03cb34a9095c8c017be2a99
Wei Huang [Wed, 26 Aug 2009 23:28:06 +0000 (16:28 -0700)]
run IM provider in gapps process instead of acore, so everything 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.
Scott Su [Thu, 20 Aug 2009 14:28:59 +0000 (22:28 +0800)]
Move the landing page to IM application and remove the depency of 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.
Wei Huang [Fri, 21 Aug 2009 14:57:32 +0000 (07:57 -0700)]
add a "show_ts" column to the message tables (both disk and memory based tables). Provide upgrade path.
Wei Huang [Thu, 30 Jul 2009 01:49:37 +0000 (18:49 -0700)]
new s2d ids table for rmq2
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:30 +0000 (09:00 -0700)]
merge from open-source master
Eric Fischer [Tue, 4 Aug 2009 00:09:12 +0000 (17:09 -0700)]
am
4b585115: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
4b58511592ea9c6d20a522246bbe00f8bee13877'
* commit '
4b58511592ea9c6d20a522246bbe00f8bee13877':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 3 Aug 2009 23:31:44 +0000 (16:31 -0700)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:08 +0000 (14:57 -0700)]
merge from donut
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:56 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 00:48:03 +0000 (17:48 -0700)]
Merge korg/donut into korg/master
Mark Wagner [Thu, 23 Jul 2009 20:31:07 +0000 (13:31 -0700)]
mods to support chat clearing for group chats
Brett Chabot [Fri, 17 Jul 2009 00:54:37 +0000 (17:54 -0700)]
am
9d6f85f0: Fix ImProvider makefile so tests source are not included when building Improvider package.
Merge commit '
9d6f85f0aa19d210cec631b55428ee3b2b9b1036'
* commit '
9d6f85f0aa19d210cec631b55428ee3b2b9b1036':
Fix ImProvider makefile so tests source are not included when building Improvider package.
Brett Chabot [Thu, 16 Jul 2009 20:36:22 +0000 (13:36 -0700)]
Fix ImProvider makefile so tests source are not included when building Improvider package.
Jean-Baptiste Queru [Wed, 15 Jul 2009 00:13:17 +0000 (17:13 -0700)]
Merge commit 'goog/readonly-korg-master' into merge_korg_master
Eric Fischer [Mon, 13 Jul 2009 23:59:57 +0000 (16:59 -0700)]
Eric Fischer [Mon, 13 Jul 2009 22:55:51 +0000 (15:55 -0700)]
Import new translations
Wei Huang [Wed, 8 Jul 2009 02:36:49 +0000 (19:36 -0700)]
Bug
1963517: remove the IM app icon from the app launcher by default. Verizon cannot ship the current IM app as is. They will either not ship IM, or contract to get their own IM plugin apk.
Brett Chabot [Wed, 17 Jun 2009 22:39:09 +0000 (15:39 -0700)]
am
51823c08: Add permission test for im provider.
Merge commit '
51823c086b4af424aa0882315fe20deedc897a4e'
* commit '
51823c086b4af424aa0882315fe20deedc897a4e':
Add permission test for im provider.
Brett Chabot [Wed, 17 Jun 2009 16:51:54 +0000 (09:51 -0700)]
Add permission test for im provider.
Wei Huang [Fri, 22 May 2009 00:59:27 +0000 (17:59 -0700)]
Fix and refactor sqlite statements for IM database.
Wei Huang [Tue, 19 May 2009 02:03:32 +0000 (19:03 -0700)]
handle OTR messages by storing them in a in-memory messages table; remove 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.
Brandon Ballinger [Wed, 6 May 2009 00:31:22 +0000 (17:31 -0700)]
Merge branch 'readonly-p4-master'
Brandon Ballinger [Wed, 6 May 2009 00:29:14 +0000 (17:29 -0700)]
AI 148348: New UI for voice input method, courtesy of BillB.
- New layout and graphics for microphone, waveform, starting up, error message.
- Better error handling.
- More responsive to microphone input.
Automated import of CL 148348
Eric Fischer [Fri, 1 May 2009 00:24:50 +0000 (17:24 -0700)]
am
e928855: am
30b89c4: AI 148026: Update zh_TW translations.
Merge commit '
e9288557fafb8594c70ac6de0f362c08a8b3fe10'
* commit '
e9288557fafb8594c70ac6de0f362c08a8b3fe10':
AI 148026: Update zh_TW translations.
Eric Fischer [Fri, 1 May 2009 00:11:00 +0000 (17:11 -0700)]
am
30b89c4: AI 148026: Update zh_TW translations.
Merge commit '
30b89c4a8abb86aa62149c5b2cecce2acacf05ef' into donut
* commit '
30b89c4a8abb86aa62149c5b2cecce2acacf05ef':
AI 148026: Update zh_TW translations.
Eric Fischer [Thu, 30 Apr 2009 23:48:34 +0000 (16:48 -0700)]
AI 148026: Update zh_TW translations.
Automated import of CL 148026
Wei Huang [Tue, 28 Apr 2009 00:07:54 +0000 (17:07 -0700)]
store contact id in messages table instead of the contact name string; merge 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.
Wei Huang [Mon, 27 Apr 2009 17:06:11 +0000 (10:06 -0700)]
remove db trigger to delete chats when a contact is deleted.
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.
The Android Open Source Project [Fri, 24 Apr 2009 20:55:03 +0000 (13:55 -0700)]
Merge commit 'korg/donut'
Wei Huang [Thu, 23 Apr 2009 18:14:09 +0000 (11:14 -0700)]
make IM messages and chats persistent in the database.
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.
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:19 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:57:00 +0000 (17:57 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:41 +0000 (17:12 -0700)]
Merge donut into master
The Android Open Source Project [Wed, 15 Apr 2009 01:18:16 +0000 (18:18 -0700)]
Merge commit 'korg/cupcake'
Eric Fischer [Tue, 14 Apr 2009 00:16:22 +0000 (17:16 -0700)]
AI 146037: Import updated translations.
Automated import of CL 146037
Wei Huang [Mon, 13 Apr 2009 15:42:21 +0000 (08:42 -0700)]
AI 145854: am: CL 145547 - make the default build configuration to *not* 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
Eric Fischer [Fri, 10 Apr 2009 23:38:00 +0000 (16:38 -0700)]
AI 145782: Import updated translations.
DO NOT MERGE
Automated import of CL 145782
Wei Huang [Thu, 9 Apr 2009 22:43:54 +0000 (15:43 -0700)]
AI 145547: - make the default build configuration to *not* 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.
BUG=
1780685,
1779060
Automated import of CL 145547
Eric Fischer [Thu, 9 Apr 2009 01:43:31 +0000 (18:43 -0700)]
AI 145225: Import more revised translations into cupcake.
Automated import of CL 145225
Eric Fischer [Tue, 7 Apr 2009 20:55:06 +0000 (13:55 -0700)]
AI 144912: Merge from cupcake:
Change 144891 on 2009/04/07 by enf@ebcdic
Import a bunch of revised translations.
Automated import of CL 144912
Eric Fischer [Tue, 7 Apr 2009 18:48:30 +0000 (11:48 -0700)]
AI 144891: Import a bunch of revised translations.
Automated import of CL 144891
Eric Fischer [Fri, 3 Apr 2009 04:42:07 +0000 (21:42 -0700)]
AI 144355: Automated g4 rollback of changelist 144335.
*** Reason for rollback ***
Roll back US Spanish import because it made the build too big.
*** Original change description ***
Import US Spanish translations, and a few Japanese changes.
Automated import of CL 144355
Eric Fischer [Thu, 2 Apr 2009 23:42:16 +0000 (16:42 -0700)]
AI 144336: am: CL 144335 Import US Spanish translations, and a few Japanese changes.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 144336
Eric Fischer [Thu, 2 Apr 2009 23:39:23 +0000 (16:39 -0700)]
AI 144335: Import US Spanish translations, and a few Japanese changes.
Automated import of CL 144335
Eric Fischer [Tue, 31 Mar 2009 18:11:18 +0000 (11:11 -0700)]
AI 143685: am: CL 143547 Import revised translations.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 143685
Eric Fischer [Mon, 30 Mar 2009 22:52:27 +0000 (15:52 -0700)]
AI 143547: Import revised translations.
BUG=
1738388
Automated import of CL 143547
The Android Open Source Project [Sun, 29 Mar 2009 15:55:15 +0000 (08:55 -0700)]
Merge branch 'open_source_no_contributions' into google_internal
The Android Open Source Project [Fri, 27 Mar 2009 22:31:13 +0000 (15:31 -0700)]
Merge commit 'korg/cupcake'
Eric Fischer [Thu, 26 Mar 2009 00:04:29 +0000 (17:04 -0700)]
Automated import from //branches/donutburger/...@142720,142720
Eric Fischer [Wed, 25 Mar 2009 23:13:54 +0000 (16:13 -0700)]
Automated import from //branches/master/...@142759,142759
Eric Fischer [Wed, 25 Mar 2009 22:22:44 +0000 (15:22 -0700)]
Automated import from //branches/cupcake/...@142643,142643
The Android Open Source Project [Thu, 19 Mar 2009 00:39:49 +0000 (17:39 -0700)]
auto import from //branches/cupcake_rel/...@140373
Jean-Baptiste Queru [Tue, 17 Mar 2009 23:08:51 +0000 (16:08 -0700)]
Merge commit 'remotes/korg/cupcake' into merge
The Android Open Source Project [Thu, 5 Mar 2009 22:34:39 +0000 (14:34 -0800)]
auto import from //depot/cupcake/@136594
The Android Open Source Project [Wed, 4 Mar 2009 03:32:43 +0000 (19:32 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:53 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 3 Mar 2009 22:04:38 +0000 (14:04 -0800)]
auto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 06:54:46 +0000 (22:54 -0800)]
auto import from //depot/cupcake/@137055
The Android Open Source Project [Thu, 19 Feb 2009 18:57:36 +0000 (10:57 -0800)]
auto import from //branches/cupcake/...@132276
The Android Open Source Project [Fri, 13 Feb 2009 20:57:54 +0000 (12:57 -0800)]
auto import from //branches/cupcake/...@131421
The Android Open Source Project [Tue, 10 Feb 2009 23:44:06 +0000 (15:44 -0800)]
auto import from //branches/cupcake/...@130745
The Android Open Source Project [Tue, 20 Jan 2009 22:05:43 +0000 (14:05 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Tue, 20 Jan 2009 22:04:01 +0000 (14:04 -0800)]
auto import from //branches/cupcake/...@127101
android-build SharedAccount [Fri, 16 Jan 2009 00:16:10 +0000 (16:16 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Fri, 16 Jan 2009 00:12:14 +0000 (16:12 -0800)]
auto import from //branches/cupcake/...@126645
The Android Open Source Project [Sat, 10 Jan 2009 02:04:23 +0000 (18:04 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Sat, 10 Jan 2009 01:51:25 +0000 (17:51 -0800)]
auto import from //branches/cupcake/...@125939
The Android Open Source Project [Thu, 18 Dec 2008 02:06:04 +0000 (18:06 -0800)]
Code drop from //branches/cupcake/...@124589
The Android Open Source Project [Tue, 21 Oct 2008 14:00:00 +0000 (07:00 -0700)]
Initial Contribution