OSDN Git Service
Jeff Sharkey [Fri, 25 Sep 2009 18:02:41 +0000 (11:02 -0700)]
am
945048ed: am
22678e77: Delay updating of Contacts.IN_VISIBLE_GROUP until finished.
Merge commit '
945048ed1cbc87d081d95cc9e15e841781115f6a'
* commit '
945048ed1cbc87d081d95cc9e15e841781115f6a':
Delay updating of Contacts.IN_VISIBLE_GROUP until finished.
Jeff Sharkey [Fri, 25 Sep 2009 18:02:37 +0000 (11:02 -0700)]
am
40cda355: am
edb54bc2: Merge change 26813 into eclair
Merge commit '
40cda3551266e4d14d8d40b2d2e5a39dbcd2df96'
* commit '
40cda3551266e4d14d8d40b2d2e5a39dbcd2df96':
Compare rawContactIds using actual number value.
Daisuke Miyakawa [Fri, 25 Sep 2009 18:02:14 +0000 (11:02 -0700)]
am
e87229d2: am
7979833d: Merge change 26710 into eclair
Merge commit '
e87229d2e794554b8020d9d57b149e2e615c2289'
* commit '
e87229d2e794554b8020d9d57b149e2e615c2289':
Delay the type value change until the custom value is correct.
Jeff Sharkey [Fri, 25 Sep 2009 18:02:04 +0000 (11:02 -0700)]
am
4db98fa9: am
54c69bbd: Bring back EAS assistant name editor.
Merge commit '
4db98fa951b938deed6b6acd14b60e77ec7d749a'
* commit '
4db98fa951b938deed6b6acd14b60e77ec7d749a':
Bring back EAS assistant name editor.
Dmitri Plotnikov [Fri, 25 Sep 2009 17:58:20 +0000 (10:58 -0700)]
am
77039163: am
d5c5ed7b: [Issue
2139542] Making sure a contact cannot be joined with itself.
Merge commit '
7703916343ea63b860d272727f5901ab9fc90725'
* commit '
7703916343ea63b860d272727f5901ab9fc90725':
[Issue
2139542] Making sure a contact cannot be joined with itself.
Dmitri Plotnikov [Fri, 25 Sep 2009 17:57:32 +0000 (10:57 -0700)]
am
5b587882: am
2a8cef0e: Fixing the issue where empty contacts could not be joined
Merge commit '
5b5878821e40a1a3c83f06a88f95b95e70e86869'
* commit '
5b5878821e40a1a3c83f06a88f95b95e70e86869':
Fixing the issue where empty contacts could not be joined
Fred Quintana [Fri, 25 Sep 2009 17:57:12 +0000 (10:57 -0700)]
am
05dd6352: am
adedd75b: Merge change 26655 into eclair
Merge commit '
05dd635291878468e18b2692e34cb6bba0fa4866'
* commit '
05dd635291878468e18b2692e34cb6bba0fa4866':
clear PHOTO column instead of deleting the row for focus
Nicolas Catania [Fri, 25 Sep 2009 17:54:14 +0000 (10:54 -0700)]
am
0839825a: am
c7f7fe66: Merge change 26641 into eclair
Merge commit '
0839825a4697ef53e046eb361abcaa78986ebd64'
* commit '
0839825a4697ef53e046eb361abcaa78986ebd64':
Change the haptic feedback from a duration to a pattern.
Megha Joshi [Fri, 25 Sep 2009 17:54:10 +0000 (10:54 -0700)]
am
860cf737: am
8cd3192e: Merge change 26264 into eclair
Merge commit '
860cf737d8b7072d60b47c72a6c928fdded63cbc'
* commit '
860cf737d8b7072d60b47c72a6c928fdded63cbc':
Assoicates make primary logic with the remember this choice checkbox
Jeff Sharkey [Fri, 25 Sep 2009 17:53:16 +0000 (10:53 -0700)]
am
e08695bc: am
3ef91edb: Populate default types for nickname and website.
Merge commit '
e08695bc242e99312319ada34eb7125d83736a4d'
* commit '
e08695bc242e99312319ada34eb7125d83736a4d':
Populate default types for nickname and website.
Daisuke Miyakawa [Fri, 25 Sep 2009 17:52:56 +0000 (10:52 -0700)]
am
bf800b84: am
a6168001: Merge change 26666 into eclair
Merge commit '
bf800b846da43ec44ca36e9a589ffc50b5a4d65d'
* commit '
bf800b846da43ec44ca36e9a589ffc50b5a4d65d':
Suppress showDialog() if the Activity is finishing().
Jeff Sharkey [Fri, 25 Sep 2009 17:52:39 +0000 (10:52 -0700)]
am
9ec01a7b: am
3bf0eb45: Only allow 1 organization for EAS contacts.
Merge commit '
9ec01a7b08d89a086aca02bb457e52b8f71074a7'
* commit '
9ec01a7b08d89a086aca02bb457e52b8f71074a7':
Only allow 1 organization for EAS contacts.
Jeff Sharkey [Fri, 25 Sep 2009 17:52:35 +0000 (10:52 -0700)]
am
5d0e6762: am
d56ac37b: Avoid OOB exception when editing contacts.
Merge commit '
5d0e6762ccef3c568e444b6997f58348e28d48ac'
* commit '
5d0e6762ccef3c568e444b6997f58348e28d48ac':
Avoid OOB exception when editing contacts.
Nicolas Catania [Fri, 25 Sep 2009 17:50:59 +0000 (10:50 -0700)]
am
35067664: am
636d9a14: Merge change 26599 into eclair
Merge commit '
35067664f29d8f428e940451ada163610a82d580'
* commit '
35067664f29d8f428e940451ada163610a82d580':
New assets for the new UI design.
Evan Millar [Fri, 25 Sep 2009 15:52:16 +0000 (08:52 -0700)]
am
145ddb36: am
3adbc245: Fix a couple layout bugs in call list and call log.
Merge commit '
145ddb36fbdfb10a8ab201c49697c5469754d286'
* commit '
145ddb36fbdfb10a8ab201c49697c5469754d286':
Fix a couple layout bugs in call list and call log.
Daisuke Miyakawa [Fri, 25 Sep 2009 15:51:31 +0000 (08:51 -0700)]
am
f0fb7e4b: am
cc27053c: Merge change 26614 into eclair
Merge commit '
f0fb7e4b5e2df4d6ac5a0793b0512aec344357c8'
* commit '
f0fb7e4b5e2df4d6ac5a0793b0512aec344357c8':
Make Contacts app not allow users to create empty label for TYPE_CUSTOM field.
Vasu Nori [Fri, 25 Sep 2009 15:50:38 +0000 (08:50 -0700)]
am
cda13974: am
8eecbe61: Avoid NPE if host is null, e.g. for "custom" IM protocol.
Merge commit '
cda13974fa4334a78d265cf37893fd07e5f2d4c7'
* commit '
cda13974fa4334a78d265cf37893fd07e5f2d4c7':
Avoid NPE if host is null, e.g. for "custom" IM protocol.
Megha Joshi [Fri, 25 Sep 2009 15:50:18 +0000 (08:50 -0700)]
am
855a3117: am
2aa7684d: Merge change 26584 into eclair
Merge commit '
855a31173ae240a4699d1478de62831f9e5acb07'
* commit '
855a31173ae240a4699d1478de62831f9e5acb07':
Turns the create contact dialog into a Activity managed
Jeff Sharkey [Fri, 25 Sep 2009 15:49:28 +0000 (08:49 -0700)]
am
526b13c0: am
88d00c24: Hook up logic for re-parenting of user edits, unit tests.
Merge commit '
526b13c0c93359d13c1085449d219dcdf5cce0f1'
* commit '
526b13c0c93359d13c1085449d219dcdf5cce0f1':
Hook up logic for re-parenting of user edits, unit tests.
Jeff Sharkey [Fri, 25 Sep 2009 15:49:20 +0000 (08:49 -0700)]
am
2bfc6da4: am
2e6148fe: Use specific columns when building IM strings.
Merge commit '
2bfc6da4da2914b7b333d21629fbc5738dc7195c'
* commit '
2bfc6da4da2914b7b333d21629fbc5738dc7195c':
Use specific columns when building IM strings.
Megha Joshi [Fri, 25 Sep 2009 15:46:06 +0000 (08:46 -0700)]
am
87c2db46: am
ec63f908: Check for selected contact row not null in onSavedInstanceState()
Merge commit '
87c2db46fec864ac61866e03176be7535217377f'
* commit '
87c2db46fec864ac61866e03176be7535217377f':
Check for selected contact row not null in onSavedInstanceState()
Dmitri Plotnikov [Fri, 25 Sep 2009 15:45:57 +0000 (08:45 -0700)]
am
004ef467: am
47edff11: [Issue
2099417] Contact list now shows presence dots
Merge commit '
004ef46766f8dc8c948c1962c90bdbcfbd359eca'
* commit '
004ef46766f8dc8c948c1962c90bdbcfbd359eca':
[Issue
2099417] Contact list now shows presence dots
Jeff Sharkey [Thu, 24 Sep 2009 10:26:16 +0000 (03:26 -0700)]
am
22678e77: Delay updating of Contacts.IN_VISIBLE_GROUP until finished.
Merge commit '
22678e774a90943c33be27853ca42f9b8bb73d07' into eclair-plus-aosp
* commit '
22678e774a90943c33be27853ca42f9b8bb73d07':
Delay updating of Contacts.IN_VISIBLE_GROUP until finished.
Jeff Sharkey [Thu, 24 Sep 2009 10:21:43 +0000 (03:21 -0700)]
am
edb54bc2: Merge change 26813 into eclair
Merge commit '
edb54bc2bc74a2c6be8e51dfdd0f1ac26ffcf3e0' into eclair-plus-aosp
* commit '
edb54bc2bc74a2c6be8e51dfdd0f1ac26ffcf3e0':
Compare rawContactIds using actual number value.
Jeff Sharkey [Thu, 24 Sep 2009 10:10:06 +0000 (03:10 -0700)]
Delay updating of Contacts.IN_VISIBLE_GROUP until finished.
To help prevent ANRs, this change take advantage of new
query parameters that delay updating until explicitly
requested. When the user finishes changing groups and
presses back, we show a progress dialog while we force a
single visible update pass in the background.
Fixes http://b/
2075275
Android (Google) Code Review [Thu, 24 Sep 2009 10:14:08 +0000 (06:14 -0400)]
Merge change 26813 into eclair
* changes:
Compare rawContactIds using actual number value.
Jeff Sharkey [Thu, 24 Sep 2009 10:11:13 +0000 (03:11 -0700)]
Compare rawContactIds using actual number value.
Daisuke Miyakawa [Thu, 24 Sep 2009 08:44:38 +0000 (01:44 -0700)]
am
7979833d: Merge change 26710 into eclair
Merge commit '
7979833d80750c70d49ba3e8ba923d31dc50b617' into eclair-plus-aosp
* commit '
7979833d80750c70d49ba3e8ba923d31dc50b617':
Delay the type value change until the custom value is correct.
Android (Google) Code Review [Thu, 24 Sep 2009 08:39:25 +0000 (04:39 -0400)]
Merge change 26710 into eclair
* changes:
Delay the type value change until the custom value is correct.
Jeff Sharkey [Thu, 24 Sep 2009 07:59:55 +0000 (00:59 -0700)]
am
54c69bbd: Bring back EAS assistant name editor.
Merge commit '
54c69bbd8517c3414402bec9191bb9fb823c6d44' into eclair-plus-aosp
* commit '
54c69bbd8517c3414402bec9191bb9fb823c6d44':
Bring back EAS assistant name editor.
Jeff Sharkey [Thu, 24 Sep 2009 07:53:38 +0000 (00:53 -0700)]
Bring back EAS assistant name editor.
Dmitri Plotnikov [Thu, 24 Sep 2009 02:34:02 +0000 (19:34 -0700)]
am
d5c5ed7b: [Issue
2139542] Making sure a contact cannot be joined with itself.
Merge commit '
d5c5ed7b8586632c5a1f739014f0b6a80504d2b2' into eclair-plus-aosp
* commit '
d5c5ed7b8586632c5a1f739014f0b6a80504d2b2':
[Issue
2139542] Making sure a contact cannot be joined with itself.
Dmitri Plotnikov [Thu, 24 Sep 2009 02:21:11 +0000 (19:21 -0700)]
[Issue
2139542] Making sure a contact cannot be joined with itself.
Change-Id: If1a8ab01941e2017ed7532a61607c4ce09793e14
Dmitri Plotnikov [Thu, 24 Sep 2009 02:09:38 +0000 (19:09 -0700)]
am
2a8cef0e: Fixing the issue where empty contacts could not be joined
Merge commit '
2a8cef0eefdee8b8e6345851e304b609ae21dd2e' into eclair-plus-aosp
* commit '
2a8cef0eefdee8b8e6345851e304b609ae21dd2e':
Fixing the issue where empty contacts could not be joined
Fred Quintana [Thu, 24 Sep 2009 02:04:17 +0000 (19:04 -0700)]
am
adedd75b: Merge change 26655 into eclair
Merge commit '
adedd75b1900c4c794a9e5702d9f43bdba4cea7c' into eclair-plus-aosp
* commit '
adedd75b1900c4c794a9e5702d9f43bdba4cea7c':
clear PHOTO column instead of deleting the row for focus
Dmitri Plotnikov [Thu, 24 Sep 2009 02:01:15 +0000 (19:01 -0700)]
Fixing the issue where empty contacts could not be joined
Basically if you did not have any _displayable_ items on a contact,
you could not merge it with another contact.
Change-Id: I58807cc25390bce4edb5fb0870641920281571f9
Android (Google) Code Review [Thu, 24 Sep 2009 01:59:03 +0000 (21:59 -0400)]
Merge change 26655 into eclair
* changes:
clear PHOTO column instead of deleting the row for focus
Daisuke Miyakawa [Wed, 23 Sep 2009 23:40:17 +0000 (16:40 -0700)]
Delay the type value change until the custom value is correct.
Also make createCustomDialog() private, as
- This method is used only by createLableDialog()
- This method heavily depends on the state of private instances (mKind, mType),
so I thought external objects should not touch this method directly.
Internal issue number:
1752454
Nicolas Catania [Wed, 23 Sep 2009 22:49:26 +0000 (15:49 -0700)]
am
c7f7fe66: Merge change 26641 into eclair
Merge commit '
c7f7fe66d24291d72c2f4324c72fe40a525ae6d2' into eclair-plus-aosp
* commit '
c7f7fe66d24291d72c2f4324c72fe40a525ae6d2':
Change the haptic feedback from a duration to a pattern.
Megha Joshi [Wed, 23 Sep 2009 22:49:22 +0000 (15:49 -0700)]
am
8cd3192e: Merge change 26264 into eclair
Merge commit '
8cd3192e9e77348a6c01f4bc2d7191235d739335' into eclair-plus-aosp
* commit '
8cd3192e9e77348a6c01f4bc2d7191235d739335':
Assoicates make primary logic with the remember this choice checkbox
Android (Google) Code Review [Wed, 23 Sep 2009 22:42:23 +0000 (18:42 -0400)]
Merge change 26641 into eclair
* changes:
Change the haptic feedback from a duration to a pattern.
Android (Google) Code Review [Wed, 23 Sep 2009 22:05:04 +0000 (18:05 -0400)]
Merge change 26264 into eclair
* changes:
Assoicates make primary logic with the remember this choice checkbox in fasttrack window.
Jeff Sharkey [Wed, 23 Sep 2009 22:03:30 +0000 (15:03 -0700)]
am
3ef91edb: Populate default types for nickname and website.
Merge commit '
3ef91edb750cee8c7843a0702134bec90b8baef4' into eclair-plus-aosp
* commit '
3ef91edb750cee8c7843a0702134bec90b8baef4':
Populate default types for nickname and website.
Jeff Sharkey [Wed, 23 Sep 2009 21:55:29 +0000 (14:55 -0700)]
Populate default types for nickname and website.
Fixes http://b/
2138153
Daisuke Miyakawa [Wed, 23 Sep 2009 21:41:38 +0000 (14:41 -0700)]
am
a6168001: Merge change 26666 into eclair
Merge commit '
a6168001516d8f6ae3e95289af25fd1c3088e3d7' into eclair-plus-aosp
* commit '
a6168001516d8f6ae3e95289af25fd1c3088e3d7':
Suppress showDialog() if the Activity is finishing().
Android (Google) Code Review [Wed, 23 Sep 2009 21:36:34 +0000 (17:36 -0400)]
Merge change 26666 into eclair
* changes:
Suppress showDialog() if the Activity is finishing().
Megha Joshi [Mon, 21 Sep 2009 22:36:26 +0000 (15:36 -0700)]
Assoicates make primary logic with the remember this choice checkbox
in fasttrack window.
Fixes bug
2072454
Fred Quintana [Wed, 23 Sep 2009 20:08:35 +0000 (13:08 -0700)]
clear PHOTO column instead of deleting the row for focus
Jeff Sharkey [Wed, 23 Sep 2009 21:27:08 +0000 (14:27 -0700)]
am
3bf0eb45: Only allow 1 organization for EAS contacts.
Merge commit '
3bf0eb4512f8d8da1fabf6d71da2961bb8f2eb31' into eclair-plus-aosp
* commit '
3bf0eb4512f8d8da1fabf6d71da2961bb8f2eb31':
Only allow 1 organization for EAS contacts.
Jeff Sharkey [Wed, 23 Sep 2009 21:27:04 +0000 (14:27 -0700)]
am
d56ac37b: Avoid OOB exception when editing contacts.
Merge commit '
d56ac37b23c3d6fb7999a46b8999ee9b40779be5' into eclair-plus-aosp
* commit '
d56ac37b23c3d6fb7999a46b8999ee9b40779be5':
Avoid OOB exception when editing contacts.
Jeff Sharkey [Wed, 23 Sep 2009 21:22:27 +0000 (14:22 -0700)]
Only allow 1 organization for EAS contacts.
Fixes http://b/
2139188
Jeff Sharkey [Wed, 23 Sep 2009 21:16:59 +0000 (14:16 -0700)]
Avoid OOB exception when editing contacts.
Fixes http://b/
2140908
Daisuke Miyakawa [Wed, 23 Sep 2009 20:52:58 +0000 (13:52 -0700)]
Suppress showDialog() if the Activity is finishing().
Internal issue number:
2133273
Nicolas Catania [Wed, 23 Sep 2009 20:27:45 +0000 (13:27 -0700)]
am
636d9a14: Merge change 26599 into eclair
Merge commit '
636d9a14a23a1c545e1d4a2704306313f0612752' into eclair-plus-aosp
* commit '
636d9a14a23a1c545e1d4a2704306313f0612752':
New assets for the new UI design.
Android (Google) Code Review [Wed, 23 Sep 2009 19:56:34 +0000 (15:56 -0400)]
Merge change 26599 into eclair
* changes:
New assets for the new UI design.
Nicolas Catania [Wed, 23 Sep 2009 18:42:00 +0000 (11:42 -0700)]
Change the haptic feedback from a duration to a pattern.
The pattern is a platform config parameter.
Removed config_dialer_key_vibrate_duration, it is not needed.
Bug
2139025
Evan Millar [Wed, 23 Sep 2009 18:38:28 +0000 (11:38 -0700)]
Evan Millar [Wed, 23 Sep 2009 18:37:18 +0000 (11:37 -0700)]
am
2b6c221e: am
d7f0d068: Merge change 26461 into eclair
Merge commit '
2b6c221eb113f12b547c6c51b68061fa83e9c334'
* commit '
2b6c221eb113f12b547c6c51b68061fa83e9c334':
Remove the aggregate icon when it ceases to be an aggregate.
Neel Parekh [Wed, 23 Sep 2009 18:35:39 +0000 (11:35 -0700)]
am
1052cb1f: am
865d5d0f: Fix spacing issues on "No favorites" text message
Merge commit '
1052cb1f3bbeaac42cb622adac48aceaf5b793cd'
* commit '
1052cb1f3bbeaac42cb622adac48aceaf5b793cd':
Fix spacing issues on "No favorites" text message
Neel Parekh [Wed, 23 Sep 2009 18:34:04 +0000 (11:34 -0700)]
am
8cc2c566: am
7730e4ee: Merge change 26404 into eclair
Merge commit '
8cc2c5667a5d7716647c34a72d374ecf2d4bc276'
* commit '
8cc2c5667a5d7716647c34a72d374ecf2d4bc276':
Show header to user when fields were hidden since they were read-only.
Megha Joshi [Wed, 23 Sep 2009 18:33:12 +0000 (11:33 -0700)]
am
6dc84f3d: am
437b95a6: Merge change 26410 into eclair
Merge commit '
6dc84f3decf6dcad076c071206754eb67491c240'
* commit '
6dc84f3decf6dcad076c071206754eb67491c240':
Fixes layout of fasttrackwindow disambig dialog.
Jeff Sharkey [Wed, 23 Sep 2009 18:33:08 +0000 (11:33 -0700)]
am
5279ccea: am
16d6b342: Set readOnly flag based on SyncAdapterType.
Merge commit '
5279ccea058cbff172e6bcefee5d0a6fd220f76e'
* commit '
5279ccea058cbff172e6bcefee5d0a6fd220f76e':
Set readOnly flag based on SyncAdapterType.
Evan Millar [Wed, 23 Sep 2009 18:29:42 +0000 (11:29 -0700)]
am
6e608a67: am
51514db2: Do a better job at removing tabs code.
Merge commit '
6e608a67091ba3b1e19757265c5fd99c7b18be98'
* commit '
6e608a67091ba3b1e19757265c5fd99c7b18be98':
Do a better job at removing tabs code.
Evan Millar [Wed, 23 Sep 2009 18:29:38 +0000 (11:29 -0700)]
am
19e47206: am
255edba2: Merge change 26392 into eclair
Merge commit '
19e4720692f23ee079b7cb80864bbac276ee2197'
* commit '
19e4720692f23ee079b7cb80864bbac276ee2197':
Fix long names in recent calls screen.
Evan Millar [Wed, 23 Sep 2009 18:21:15 +0000 (11:21 -0700)]
am
3adbc245: Fix a couple layout bugs in call list and call log.
Merge commit '
3adbc245661425e7a827882717bf940b0d699187' into eclair-plus-aosp
* commit '
3adbc245661425e7a827882717bf940b0d699187':
Fix a couple layout bugs in call list and call log.
Evan Millar [Wed, 23 Sep 2009 17:51:46 +0000 (10:51 -0700)]
Fix a couple layout bugs in call list and call log.
-Fixed http://b/issue?id=
2139651
-Fixed http://b/issue?id=
2119813
-Also use the *opaque version of the dividers to match the default list
style.
Change-Id: Iaed2f3625630c6f09b0dd5742cf21102a37b11ac
Daisuke Miyakawa [Wed, 23 Sep 2009 17:47:12 +0000 (10:47 -0700)]
am
cc27053c: Merge change 26614 into eclair
Merge commit '
cc27053c0f38fbdfd75c54fd5bcb70085c8ddc2f' into eclair-plus-aosp
* commit '
cc27053c0f38fbdfd75c54fd5bcb70085c8ddc2f':
Make Contacts app not allow users to create empty label for TYPE_CUSTOM field.
Android (Google) Code Review [Wed, 23 Sep 2009 17:37:28 +0000 (13:37 -0400)]
Merge change 26614 into eclair
* changes:
Make Contacts app not allow users to create empty label for TYPE_CUSTOM field.
Daisuke Miyakawa [Wed, 23 Sep 2009 17:35:18 +0000 (10:35 -0700)]
Make Contacts app not allow users to create empty label for TYPE_CUSTOM field.
Internal issue number:
1752454
Vasu Nori [Wed, 23 Sep 2009 17:14:30 +0000 (10:14 -0700)]
am
8eecbe61: Avoid NPE if host is null, e.g. for "custom" IM protocol.
Merge commit '
8eecbe6173d0fca25edc5b93dd3bb1612657ddf7' into eclair-plus-aosp
* commit '
8eecbe6173d0fca25edc5b93dd3bb1612657ddf7':
Avoid NPE if host is null, e.g. for "custom" IM protocol.
Vasu Nori [Wed, 23 Sep 2009 00:23:38 +0000 (17:23 -0700)]
Avoid NPE if host is null, e.g. for "custom" IM protocol.
Megha Joshi [Wed, 23 Sep 2009 16:59:12 +0000 (09:59 -0700)]
am
2aa7684d: Merge change 26584 into eclair
Merge commit '
2aa7684d34ca8dd947344cebeea983234d9c28f3' into eclair-plus-aosp
* commit '
2aa7684d34ca8dd947344cebeea983234d9c28f3':
Turns the create contact dialog into a Activity managed
Android (Google) Code Review [Wed, 23 Sep 2009 16:50:49 +0000 (12:50 -0400)]
Merge change 26584 into eclair
* changes:
Turns the create contact dialog into a Activity managed dialog to fix window leak. Fixes bug
2133210.
Megha Joshi [Wed, 23 Sep 2009 10:21:07 +0000 (03:21 -0700)]
Turns the create contact dialog into a Activity managed
dialog to fix window leak.
Fixes bug
2133210.
Nicolas Catania [Wed, 23 Sep 2009 15:14:05 +0000 (08:14 -0700)]
New assets for the new UI design.
Removed old tabs assets, replaced with new ones.
Bug:
2104523
Jeff Sharkey [Wed, 23 Sep 2009 12:48:24 +0000 (05:48 -0700)]
am
88d00c24: Hook up logic for re-parenting of user edits, unit tests.
Merge commit '
88d00c2450a0a16bf1dd35e9f3c9ba843a97ec62' into eclair-plus-aosp
* commit '
88d00c2450a0a16bf1dd35e9f3c9ba843a97ec62':
Hook up logic for re-parenting of user edits, unit tests.
Jeff Sharkey [Tue, 22 Sep 2009 22:36:10 +0000 (15:36 -0700)]
Hook up logic for re-parenting of user edits, unit tests.
When persisting edits, we assert that RawContacts.VERSION
has remained consistent. When this check fails, it usually
means that a server change has changed the underlying data,
and instead of dropping user edits, we "re-parent" their
changes after re-reading the base data.
This change finishes up the re-parenting logic to run over
an entire EntitySet, and also has a nice pile of unit tests
to verify behavior. Fixes http://b/
2115136
Jeff Sharkey [Wed, 23 Sep 2009 09:47:07 +0000 (02:47 -0700)]
am
2e6148fe: Use specific columns when building IM strings.
Merge commit '
2e6148fe7d8a3e724d8a8f10780d7e5571780279' into eclair-plus-aosp
* commit '
2e6148fe7d8a3e724d8a8f10780d7e5571780279':
Use specific columns when building IM strings.
Jeff Sharkey [Tue, 22 Sep 2009 22:36:57 +0000 (15:36 -0700)]
Use specific columns when building IM strings.
Fixes http://b/
2138429
Megha Joshi [Wed, 23 Sep 2009 01:57:54 +0000 (18:57 -0700)]
am
ec63f908: Check for selected contact row not null in onSavedInstanceState()
Merge commit '
ec63f908762dd05d47561f2bebf402c97d6ab833' into eclair-plus-aosp
* commit '
ec63f908762dd05d47561f2bebf402c97d6ab833':
Check for selected contact row not null in onSavedInstanceState()
Megha Joshi [Wed, 23 Sep 2009 01:47:39 +0000 (18:47 -0700)]
Check for selected contact row not null in onSavedInstanceState()
Fixes bug
2129469
Conflicts:
src/com/android/contacts/ViewContactActivity.java
Dmitri Plotnikov [Wed, 23 Sep 2009 01:47:26 +0000 (18:47 -0700)]
am
47edff11: [Issue
2099417] Contact list now shows presence dots
Merge commit '
47edff11274d01c26a0d7ac39ccf76bce3298a6f' into eclair-plus-aosp
* commit '
47edff11274d01c26a0d7ac39ccf76bce3298a6f':
[Issue
2099417] Contact list now shows presence dots
Dmitri Plotnikov [Wed, 23 Sep 2009 01:28:18 +0000 (18:28 -0700)]
[Issue
2099417] Contact list now shows presence dots
Change-Id: I2d8fb3af86a2e11d3c6d53c7b9e66efcf96038d5
Evan Millar [Tue, 22 Sep 2009 23:30:15 +0000 (16:30 -0700)]
am
039a2aab: Check for null cursor
Merge commit '
039a2aabee31d054b4f14a7f2e1cfa5ffd2be93d' into eclair-plus-aosp
* commit '
039a2aabee31d054b4f14a7f2e1cfa5ffd2be93d':
Check for null cursor
Evan Millar [Tue, 22 Sep 2009 23:20:39 +0000 (16:20 -0700)]
Check for null cursor
Change-Id: I2d59b92684f67103098fd78b3e78727b9319deb5
Evan Millar [Tue, 22 Sep 2009 22:50:39 +0000 (15:50 -0700)]
am
d7f0d068: Merge change 26461 into eclair
Merge commit '
d7f0d0686f1fba3e3b9dc9e1d7369fb9dcb4ed53' into eclair-plus-aosp
* commit '
d7f0d0686f1fba3e3b9dc9e1d7369fb9dcb4ed53':
Remove the aggregate icon when it ceases to be an aggregate.
Android (Google) Code Review [Tue, 22 Sep 2009 22:32:54 +0000 (18:32 -0400)]
Merge change 26461 into eclair
* changes:
Remove the aggregate icon when it ceases to be an aggregate.
Evan Millar [Tue, 22 Sep 2009 22:27:47 +0000 (15:27 -0700)]
Remove the aggregate icon when it ceases to be an aggregate.
Change-Id: I157f95525b1b5f4d7e18aa91f0b93b80514b33be
Neel Parekh [Tue, 22 Sep 2009 21:38:40 +0000 (14:38 -0700)]
am
865d5d0f: Fix spacing issues on "No favorites" text message
Merge commit '
865d5d0feb2de3cc9897b839a3f70b7e0636ea95' into eclair-plus-aosp
* commit '
865d5d0feb2de3cc9897b839a3f70b7e0636ea95':
Fix spacing issues on "No favorites" text message
Neel Parekh [Tue, 22 Sep 2009 21:26:26 +0000 (14:26 -0700)]
Fix spacing issues on "No favorites" text message
Neel Parekh [Tue, 22 Sep 2009 21:02:19 +0000 (14:02 -0700)]
am
7730e4ee: Merge change 26404 into eclair
Merge commit '
7730e4ee311019800f2ad45926d5b5ec3251a726' into eclair-plus-aosp
* commit '
7730e4ee311019800f2ad45926d5b5ec3251a726':
Show header to user when fields were hidden since they were read-only.
Android (Google) Code Review [Tue, 22 Sep 2009 20:54:43 +0000 (16:54 -0400)]
Merge change 26404 into eclair
* changes:
Show header to user when fields were hidden since they were read-only.
Neel Parekh [Tue, 22 Sep 2009 19:01:39 +0000 (12:01 -0700)]
Show header to user when fields were hidden since they were read-only.
Bug:
2121692
Megha Joshi [Tue, 22 Sep 2009 20:36:58 +0000 (13:36 -0700)]
am
437b95a6: Merge change 26410 into eclair
Merge commit '
437b95a6aeed522ddd482892e8e72f2ffafe08d7' into eclair-plus-aosp
* commit '
437b95a6aeed522ddd482892e8e72f2ffafe08d7':
Fixes layout of fasttrackwindow disambig dialog.
Jeff Sharkey [Tue, 22 Sep 2009 20:36:54 +0000 (13:36 -0700)]
am
16d6b342: Set readOnly flag based on SyncAdapterType.
Merge commit '
16d6b342bcedb2bc047788eae248eb70cf94a458' into eclair-plus-aosp
* commit '
16d6b342bcedb2bc047788eae248eb70cf94a458':
Set readOnly flag based on SyncAdapterType.
Android (Google) Code Review [Tue, 22 Sep 2009 20:33:51 +0000 (16:33 -0400)]
Merge change 26410 into eclair
* changes:
Fixes layout of fasttrackwindow disambig dialog.
Jeff Sharkey [Tue, 22 Sep 2009 20:26:59 +0000 (13:26 -0700)]
Set readOnly flag based on SyncAdapterType.
Megha Joshi [Tue, 22 Sep 2009 17:01:00 +0000 (10:01 -0700)]
Fixes layout of fasttrackwindow disambig dialog.
Bug:
2122144
Reviewed-by: jsharkey@google.com
Evan Millar [Tue, 22 Sep 2009 18:52:07 +0000 (11:52 -0700)]
am
51514db2: Do a better job at removing tabs code.
Merge commit '
51514db2341d8e9fddb588249d084021a1d50dc2' into eclair-plus-aosp
* commit '
51514db2341d8e9fddb588249d084021a1d50dc2':
Do a better job at removing tabs code.
Evan Millar [Tue, 22 Sep 2009 18:46:23 +0000 (11:46 -0700)]
am
255edba2: Merge change 26392 into eclair
Merge commit '
255edba2d6803bdc62ea82e93669fd95a7523b15' into eclair-plus-aosp
* commit '
255edba2d6803bdc62ea82e93669fd95a7523b15':
Fix long names in recent calls screen.