OSDN Git Service
Jeff Hamilton [Mon, 12 Oct 2009 19:07:26 +0000 (12:07 -0700)]
am
44d99c67: am
4bef56bd: Show phones and email addresses for read-only contacts.
Merge commit '
44d99c673b63472e5f855588b313b46840165a64' into eclair-mr2-plus-aosp
* commit '
44d99c673b63472e5f855588b313b46840165a64':
Show phones and email addresses for read-only contacts.
Jeff Hamilton [Mon, 12 Oct 2009 19:00:43 +0000 (12:00 -0700)]
am
4bef56bd: Show phones and email addresses for read-only contacts.
Merge commit '
4bef56bdbde4c6bd439ed2d528d4b99974359e18' into eclair-mr2
* commit '
4bef56bdbde4c6bd439ed2d528d4b99974359e18':
Show phones and email addresses for read-only contacts.
Jeff Hamilton [Sun, 11 Oct 2009 06:17:48 +0000 (01:17 -0500)]
Show phones and email addresses for read-only contacts.
Bug:
2180041
Change-Id: I686e5413bb3de4c9373da177673c485581c87bb9
Eric Fischer [Fri, 9 Oct 2009 23:38:56 +0000 (16:38 -0700)]
am
fcf5f4c9: am
387a22c7: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
fcf5f4c9e3c521b732e67173963eb87609cad6be' into eclair-mr2-plus-aosp
* commit '
fcf5f4c9e3c521b732e67173963eb87609cad6be':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 9 Oct 2009 23:27:07 +0000 (16:27 -0700)]
am
387a22c7: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
387a22c79782ddb6bea57d1f80ec227f0842a253' into eclair-mr2
* commit '
387a22c79782ddb6bea57d1f80ec227f0842a253':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 9 Oct 2009 22:36:01 +0000 (15:36 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Nicolas Catania [Fri, 9 Oct 2009 21:44:51 +0000 (14:44 -0700)]
am
a6ecc0ed: Merge change Ieb30191a into eclair-mr2
Merge commit '
a6ecc0edf8db5fca95e3d4b10e384f4c7ea55025' into eclair-mr2-plus-aosp
* commit '
a6ecc0edf8db5fca95e3d4b10e384f4c7ea55025':
In landscape mode, set the type of digit area to PHONE.
Android (Google) Code Review [Fri, 9 Oct 2009 21:35:33 +0000 (17:35 -0400)]
Merge change Ieb30191a into eclair-mr2
* changes:
In landscape mode, set the type of digit area to PHONE.
Evan Millar [Fri, 9 Oct 2009 20:03:18 +0000 (13:03 -0700)]
am
0641d14c: am
0c035143: Clear bitmap cache in onResume() to make sure photos are fresh.
Merge commit '
0641d14c3b275069a062a2dc260fa4a6faa67416' into eclair-mr2-plus-aosp
* commit '
0641d14c3b275069a062a2dc260fa4a6faa67416':
Clear bitmap cache in onResume() to make sure photos are fresh.
Evan Millar [Fri, 9 Oct 2009 19:58:39 +0000 (12:58 -0700)]
am
0c035143: Clear bitmap cache in onResume() to make sure photos are fresh.
Merge commit '
0c035143ed4dee093bbfa3b8bdcda2ddf3fdb528' into eclair-mr2
* commit '
0c035143ed4dee093bbfa3b8bdcda2ddf3fdb528':
Clear bitmap cache in onResume() to make sure photos are fresh.
Evan Millar [Fri, 9 Oct 2009 17:13:32 +0000 (10:13 -0700)]
Clear bitmap cache in onResume() to make sure photos are fresh.
bc_triaged bug: http://b/issue?id=
2177238
Dr. No: Tim Sullivan
Nicolas Catania [Fri, 9 Oct 2009 18:09:45 +0000 (11:09 -0700)]
In landscape mode, set the type of digit area to PHONE.
Previously we blindely set the EditText to NULL to prevent the IME
keyboard to pop up in portrait mode. The issue is that in landscape
mode, the keyboard is not in numlock mode which is a pb on devices
where the 1st line is not made of numbers.
Bug:
2167203
Jeff Hamilton [Fri, 9 Oct 2009 05:01:29 +0000 (22:01 -0700)]
am
a8c8fd19: am
dbb924c4: Merge change I700622d9 into eclair
Merge commit '
a8c8fd19314c2b1dd72a00ec922b98cff911b943' into eclair-mr2-plus-aosp
* commit '
a8c8fd19314c2b1dd72a00ec922b98cff911b943':
Fix up photo editing, and few other tweaks to contact editing.
Jeff Hamilton [Fri, 9 Oct 2009 04:56:15 +0000 (21:56 -0700)]
am
dbb924c4: Merge change I700622d9 into eclair
Merge commit '
dbb924c493b8fffd8f7f0d2172953ba5c2b2c7a5' into eclair-mr2
* commit '
dbb924c493b8fffd8f7f0d2172953ba5c2b2c7a5':
Fix up photo editing, and few other tweaks to contact editing.
Android (Google) Code Review [Fri, 9 Oct 2009 04:47:19 +0000 (00:47 -0400)]
Merge change I700622d9 into eclair
* changes:
Fix up photo editing, and few other tweaks to contact editing.
Jeff Hamilton [Fri, 9 Oct 2009 00:46:26 +0000 (19:46 -0500)]
Fix up photo editing, and few other tweaks to contact editing.
- When tapping a photo you're given a choice to replace, remove, or use as primary
- Fix an issue where the secondary group would show when it shouldn't
- Tweak the size of the color bar per Chris
- Format phone numbers when typing them
- Fix a display issue with contacts that didn't fill the height of the screen
- If a contact is read-only and doesn't have a photo don't offer the option to add one
Bugs:
2163109 &
2163519
Change-Id: I700622d9dfdbcaa81e5b577fd5b2a38d708374aa
Jeff Sharkey [Fri, 9 Oct 2009 03:19:57 +0000 (20:19 -0700)]
am
37164a25: am
4c82d3b7: Handle external sources that request both social and detail.
Merge commit '
37164a25e91e8f233237043975dd86c639863a6e' into eclair-mr2-plus-aosp
* commit '
37164a25e91e8f233237043975dd86c639863a6e':
Handle external sources that request both social and detail.
Jeff Sharkey [Fri, 9 Oct 2009 03:14:10 +0000 (20:14 -0700)]
am
4c82d3b7: Handle external sources that request both social and detail.
Merge commit '
4c82d3b7323b498e2a21daf94505daf0cd32d212' into eclair-mr2
* commit '
4c82d3b7323b498e2a21daf94505daf0cd32d212':
Handle external sources that request both social and detail.
Jeff Sharkey [Fri, 9 Oct 2009 00:48:11 +0000 (17:48 -0700)]
am
cebe59f7: am
bbaf565e: New infobar background assets.
Merge commit '
cebe59f7ac2a1e9f884d40f5976a190603e6d032' into eclair-mr2-plus-aosp
* commit '
cebe59f7ac2a1e9f884d40f5976a190603e6d032':
New infobar background assets.
Evan Millar [Fri, 9 Oct 2009 00:48:02 +0000 (17:48 -0700)]
am
c9b077c2: am
31e197bf: Merge change I3ee009e6 into eclair
Merge commit '
c9b077c2d06607ae9e835a978e550fc68b1cfc6f' into eclair-mr2-plus-aosp
* commit '
c9b077c2d06607ae9e835a978e550fc68b1cfc6f':
Make shortcut icons adjust to hdpi display.
Eric Fischer [Fri, 9 Oct 2009 00:47:59 +0000 (17:47 -0700)]
am
d8de5142: am
43ce4049: (-s ours) am
906af3fb: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
d8de5142f179d04af9d680e79c300b0ea1da11b9' into eclair-mr2-plus-aosp
* commit '
d8de5142f179d04af9d680e79c300b0ea1da11b9':
Import revised translations. DO NOT MERGE
Jeff Sharkey [Fri, 9 Oct 2009 00:47:55 +0000 (17:47 -0700)]
am
166ab1cb: am
e31dac84: Trim edit fields that don\'t contain printable values.
Merge commit '
166ab1cb67d923429d05372f1ed3a81aae9bed94' into eclair-mr2-plus-aosp
* commit '
166ab1cb67d923429d05372f1ed3a81aae9bed94':
Trim edit fields that don't contain printable values.
Jeff Sharkey [Fri, 9 Oct 2009 00:47:51 +0000 (17:47 -0700)]
am
10c3834b: am
b7da2d0f: Allow omission of RES_PACKAGE for status attributions.
Merge commit '
10c3834b4f745c235b8e1a37994b22ccd5bea767' into eclair-mr2-plus-aosp
* commit '
10c3834b4f745c235b8e1a37994b22ccd5bea767':
Allow omission of RES_PACKAGE for status attributions.
Jeff Sharkey [Fri, 9 Oct 2009 00:36:33 +0000 (17:36 -0700)]
am
bbaf565e: New infobar background assets.
Merge commit '
bbaf565e69b9d074c9ef4713e032dda7b7cdacaf' into eclair-mr2
* commit '
bbaf565e69b9d074c9ef4713e032dda7b7cdacaf':
New infobar background assets.
Evan Millar [Fri, 9 Oct 2009 00:32:58 +0000 (17:32 -0700)]
am
31e197bf: Merge change I3ee009e6 into eclair
Merge commit '
31e197bfdb4f94099c632dc89245b3b4711eb3cb' into eclair-mr2
* commit '
31e197bfdb4f94099c632dc89245b3b4711eb3cb':
Make shortcut icons adjust to hdpi display.
Eric Fischer [Fri, 9 Oct 2009 00:32:54 +0000 (17:32 -0700)]
am
43ce4049: (-s ours) am
906af3fb: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
43ce404918a6d7de76e3d4c7057f6c804e377a36' into eclair-mr2
* commit '
43ce404918a6d7de76e3d4c7057f6c804e377a36':
Import revised translations. DO NOT MERGE
Jeff Sharkey [Fri, 9 Oct 2009 00:31:16 +0000 (17:31 -0700)]
am
e31dac84: Trim edit fields that don\'t contain printable values.
Merge commit '
e31dac84479a4c7b356edfc062a447cdfb5efc69' into eclair-mr2
* commit '
e31dac84479a4c7b356edfc062a447cdfb5efc69':
Trim edit fields that don't contain printable values.
Jeff Sharkey [Fri, 9 Oct 2009 00:29:47 +0000 (17:29 -0700)]
am
b7da2d0f: Allow omission of RES_PACKAGE for status attributions.
Merge commit '
b7da2d0f30e012f786686bedea065af01f20a4e2' into eclair-mr2
* commit '
b7da2d0f30e012f786686bedea065af01f20a4e2':
Allow omission of RES_PACKAGE for status attributions.
Jeff Sharkey [Thu, 8 Oct 2009 23:57:06 +0000 (16:57 -0700)]
Handle external sources that request both social and detail.
When a source requests social summary, allow them to still
provide a fallback detail value when no social summary is
available. (Otherwise the data row would be invisible.)
Partially fixes http://b/
2176892
Jeff Sharkey [Thu, 8 Oct 2009 23:39:33 +0000 (16:39 -0700)]
New infobar background assets.
Fixes http://b/
2153296
Makoto Onuki [Thu, 8 Oct 2009 22:23:53 +0000 (15:23 -0700)]
am
d708e555: Merge change I94ee30d0 into eclair-mr2
Merge commit '
d708e5554cf5945bdbf3a6bc0db1b75502ee3194' into eclair-mr2-plus-aosp
* commit '
d708e5554cf5945bdbf3a6bc0db1b75502ee3194':
Fix the layout issue reported in b/
2167690
Android (Google) Code Review [Thu, 8 Oct 2009 22:18:45 +0000 (18:18 -0400)]
Merge change I94ee30d0 into eclair-mr2
* changes:
Fix the layout issue reported in b/
2167690
Android (Google) Code Review [Thu, 8 Oct 2009 22:07:52 +0000 (18:07 -0400)]
Merge change I3ee009e6 into eclair
* changes:
Make shortcut icons adjust to hdpi display.
Evan Millar [Thu, 8 Oct 2009 21:50:27 +0000 (14:50 -0700)]
Make shortcut icons adjust to hdpi display.
bc_triaged bug: http://b/issue?id=
2171333
Change-Id: I3ee009e6469c0472f21a1cf82875a8419c39f59a
Eric Fischer [Thu, 8 Oct 2009 21:59:34 +0000 (14:59 -0700)]
am
906af3fb: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
906af3fbedb9034c84fd18139fa16d3f542d1f67' into eclair
* commit '
906af3fbedb9034c84fd18139fa16d3f542d1f67':
Import revised translations. DO NOT MERGE
Makoto Onuki [Thu, 8 Oct 2009 21:57:14 +0000 (14:57 -0700)]
am
c9eb522e: Merge change I44f9de96 into eclair-mr2
Merge commit '
c9eb522ed0f1765d2cc3593721c909e3a3ee89c2' into eclair-mr2-plus-aosp
* commit '
c9eb522ed0f1765d2cc3593721c909e3a3ee89c2':
Don't crash even when voiceMailNumber is null, which is a valid condition.
Makoto Onuki [Thu, 8 Oct 2009 21:52:38 +0000 (14:52 -0700)]
Fix the layout issue reported in b/
2167690
Android (Google) Code Review [Thu, 8 Oct 2009 21:49:59 +0000 (17:49 -0400)]
Merge change I44f9de96 into eclair-mr2
* changes:
Don't crash even when voiceMailNumber is null, which is a valid condition.
Daisuke Miyakawa [Thu, 8 Oct 2009 19:42:53 +0000 (12:42 -0700)]
am
5a08181f: Merge change Icf3aa797 into eclair-mr2
Merge commit '
5a08181f18799248f21935bf7fca5124f86f7127' into eclair-mr2-plus-aosp
* commit '
5a08181f18799248f21935bf7fca5124f86f7127':
Clean-up ImportVCardActivity and ExportVCardActivity
Android (Google) Code Review [Thu, 8 Oct 2009 19:34:22 +0000 (15:34 -0400)]
Merge change Icf3aa797 into eclair-mr2
* changes:
Clean-up ImportVCardActivity and ExportVCardActivity
Jeff Sharkey [Thu, 8 Oct 2009 18:13:47 +0000 (11:13 -0700)]
Trim edit fields that don't contain printable values.
When persisting edit changes, trim data rows that have no
printable characters. Also wrote unit tests for new method
and building of IM intents to check Uri escaping.
Fixes http://b/
2173811
Makoto Onuki [Thu, 8 Oct 2009 18:55:54 +0000 (11:55 -0700)]
Don't crash even when voiceMailNumber is null, which is a valid condition.
Fixes bug internal issue
2162197
Daisuke Miyakawa [Thu, 8 Oct 2009 18:18:40 +0000 (11:18 -0700)]
Clean-up ImportVCardActivity and ExportVCardActivity
- Pull "mVCardReadThread.start()" out of getter method, which is confusing.
- Add extra description to each file about "one-shot Activity".
Evan Millar [Thu, 8 Oct 2009 18:02:01 +0000 (11:02 -0700)]
am
becfee4a: Don\'t show a call button in the favorites list if the contact doesn\'t have a phone number
Merge commit '
becfee4a12643678bca26a79ed44fa06eea7cfd9' into eclair-mr2-plus-aosp
* commit '
becfee4a12643678bca26a79ed44fa06eea7cfd9':
Don't show a call button in the favorites list if the contact doesn't have a phone number
Evan Millar [Thu, 8 Oct 2009 17:56:25 +0000 (10:56 -0700)]
am
65c8cf18: am
43455184: Handle IM entries with missing protocol field.
Merge commit '
65c8cf18585dc4fd39523c345f5168959b5fc3da' into eclair-mr2-plus-aosp
* commit '
65c8cf18585dc4fd39523c345f5168959b5fc3da':
Handle IM entries with missing protocol field.
Jeff Sharkey [Thu, 8 Oct 2009 17:56:21 +0000 (10:56 -0700)]
am
a37c8e89: am
cee3b66d: Omit attribution icon in medium FastTrack.
Merge commit '
a37c8e891b4354264acf5ab0403613849448ea73' into eclair-mr2-plus-aosp
* commit '
a37c8e891b4354264acf5ab0403613849448ea73':
Omit attribution icon in medium FastTrack.
Jeff Sharkey [Thu, 8 Oct 2009 17:22:30 +0000 (10:22 -0700)]
Allow omission of RES_PACKAGE for status attributions.
FastTrack was being overly cautious about attribution labels
coming from third-party sources. When no RES_PACKAGE is
defined, we now fall back to using the local package instead
of completely dropping the attribution line.
Fixes http://b/
2175531
Daisuke Miyakawa [Thu, 8 Oct 2009 17:53:17 +0000 (10:53 -0700)]
am
7c7457cf: am
2db67f79: Merge change I652a8d7b into eclair
Merge commit '
7c7457cf4f3934c1940fd922681a6ae0aa9a7a5e' into eclair-mr2-plus-aosp
* commit '
7c7457cf4f3934c1940fd922681a6ae0aa9a7a5e':
Fix ImportVCardActivity so that NPE will never occur during import.
Evan Millar [Wed, 7 Oct 2009 16:26:59 +0000 (09:26 -0700)]
Don't show a call button in the favorites list if the contact doesn't have a phone number
Fixes bug http://b/issue?id=
2151489
Evan Millar [Thu, 8 Oct 2009 17:48:25 +0000 (10:48 -0700)]
am
43455184: Handle IM entries with missing protocol field.
Merge commit '
434551849d279bd24ca132ba4102b0d55823f59e' into eclair-mr2
* commit '
434551849d279bd24ca132ba4102b0d55823f59e':
Handle IM entries with missing protocol field.
Jeff Sharkey [Thu, 8 Oct 2009 17:48:22 +0000 (10:48 -0700)]
am
cee3b66d: Omit attribution icon in medium FastTrack.
Merge commit '
cee3b66d58693707d08639b81be2c3ee2120ce6f' into eclair-mr2
* commit '
cee3b66d58693707d08639b81be2c3ee2120ce6f':
Omit attribution icon in medium FastTrack.
Evan Millar [Thu, 8 Oct 2009 17:24:12 +0000 (10:24 -0700)]
Handle IM entries with missing protocol field.
Fix bc_triaged bug http://b/issue?id=
2174637
Dr. No approval from Tim Sullivan
Change-Id: Ia91c39e91a54e3c58ec94d1c5064a9572519f036
Daisuke Miyakawa [Thu, 8 Oct 2009 17:37:17 +0000 (10:37 -0700)]
am
2db67f79: Merge change I652a8d7b into eclair
Merge commit '
2db67f796d642b71a6f0accee45dcedd1e646961' into eclair-mr2
* commit '
2db67f796d642b71a6f0accee45dcedd1e646961':
Fix ImportVCardActivity so that NPE will never occur during import.
Jeff Sharkey [Thu, 8 Oct 2009 17:29:22 +0000 (10:29 -0700)]
Omit attribution icon in medium FastTrack.
Fixes http://b/
2175531
Android (Google) Code Review [Thu, 8 Oct 2009 17:07:14 +0000 (13:07 -0400)]
Merge change I652a8d7b into eclair
* changes:
Fix ImportVCardActivity so that NPE will never occur during import.
Jeff Sharkey [Thu, 8 Oct 2009 16:44:45 +0000 (09:44 -0700)]
am
8161085e: am
71737051: Ignore transient rows during re-parenting.
Merge commit '
8161085e3fb543b3849aad2262ed2975efc98f99' into eclair-mr2-plus-aosp
* commit '
8161085e3fb543b3849aad2262ed2975efc98f99':
Ignore transient rows during re-parenting.
Jeff Sharkey [Thu, 8 Oct 2009 16:39:05 +0000 (09:39 -0700)]
am
71737051: Ignore transient rows during re-parenting.
Merge commit '
7173705177c421e0b2a3bc4579b2f8910a38a668' into eclair-mr2
* commit '
7173705177c421e0b2a3bc4579b2f8910a38a668':
Ignore transient rows during re-parenting.
Jeff Sharkey [Wed, 7 Oct 2009 20:52:48 +0000 (13:52 -0700)]
Ignore transient rows during re-parenting.
When editing, we create template rows such as StructuredName
and Photo, which may be trimmed before persisting if they
remain empty. When a background change occurs and we need
to re-parent the users changes, we didn't handle this
special case, and treated these trimmed rows as inserts,
which triggered the reported missing MIME-type exception.
This change watches for "transient" rows that didn't exist
previously, but were inserted and then deleted during the
process of editing. When encountered, they are ignored
during re-parenting, instead of turning into inserts.
Added a unit test to verify correct behavior, and also wrote
values-level verification for the existing unit tests.
Fixes http://b/
2167925
Jeff Sharkey [Thu, 8 Oct 2009 16:07:09 +0000 (09:07 -0700)]
am
5858728f: am
4c129c92: Increment tries as we reparent to avoid looping.
Merge commit '
5858728f96d80ea6042912ad763067d6c0326fb3' into eclair-mr2-plus-aosp
* commit '
5858728f96d80ea6042912ad763067d6c0326fb3':
Increment tries as we reparent to avoid looping.
Jeff Sharkey [Thu, 8 Oct 2009 16:01:53 +0000 (09:01 -0700)]
am
4c129c92: Increment tries as we reparent to avoid looping.
Merge commit '
4c129c92cb8f7f4d2a1f5dcf69a7564d5c88fd9f' into eclair-mr2
* commit '
4c129c92cb8f7f4d2a1f5dcf69a7564d5c88fd9f':
Increment tries as we reparent to avoid looping.
Jeff Sharkey [Wed, 7 Oct 2009 20:53:39 +0000 (13:53 -0700)]
Increment tries as we reparent to avoid looping.
Fixes http://b/
2173452
Jeff Hamilton [Thu, 8 Oct 2009 02:31:26 +0000 (19:31 -0700)]
am
9b241b1b: am
54b3e1fc: Merge change Ibc1b1f7d into eclair
Merge commit '
9b241b1b1b3ac0600cac084021f431b1b09f9944' into eclair-mr2-plus-aosp
* commit '
9b241b1b1b3ac0600cac084021f431b1b09f9944':
Follow up changes from review of Ib2afc992.
Jeff Hamilton [Thu, 8 Oct 2009 02:26:46 +0000 (19:26 -0700)]
am
54b3e1fc: Merge change Ibc1b1f7d into eclair
Merge commit '
54b3e1fce63c8f7233fff8ea6279ddd1a8982d9d' into eclair-mr2
* commit '
54b3e1fce63c8f7233fff8ea6279ddd1a8982d9d':
Follow up changes from review of Ib2afc992.
Android (Google) Code Review [Thu, 8 Oct 2009 02:19:24 +0000 (22:19 -0400)]
Merge change Ibc1b1f7d into eclair
* changes:
Follow up changes from review of Ib2afc992.
Dmitri Plotnikov [Thu, 8 Oct 2009 01:21:42 +0000 (18:21 -0700)]
am
40332ac1: am
406ae422: [Issue
2174171] Fixing Join Contact UI title.
Merge commit '
40332ac121bf94d7384f705a862bdc44a529e424' into eclair-mr2-plus-aosp
* commit '
40332ac121bf94d7384f705a862bdc44a529e424':
[Issue
2174171] Fixing Join Contact UI title.
Daisuke Miyakawa [Fri, 2 Oct 2009 23:48:06 +0000 (16:48 -0700)]
Fix ImportVCardActivity so that NPE will never occur during import.
The NPE occurs only when the importing thread exits before the progress dialog is shown.
In theory (and in practice), this is rare, but anyway, this is a bug.
-----IMPORTANT-----
This change is cherry-picked from the latest build to the eclair.
Please see the description in the issue bellow.
-------------------
Internal issue number:
2164280
Dmitri Plotnikov [Thu, 8 Oct 2009 01:16:07 +0000 (18:16 -0700)]
am
406ae422: [Issue
2174171] Fixing Join Contact UI title.
Merge commit '
406ae42275eda1661aecc9afe088b654aac2193d' into eclair-mr2
* commit '
406ae42275eda1661aecc9afe088b654aac2193d':
[Issue
2174171] Fixing Join Contact UI title.
Dmitri Plotnikov [Thu, 8 Oct 2009 00:07:03 +0000 (17:07 -0700)]
[Issue
2174171] Fixing Join Contact UI title.
The title should read: "Select the contact you want to join with John Doe"
Change-Id: Iec1f41ce97e251635048f91020410cc1981cffbb
Neel Parekh [Thu, 8 Oct 2009 00:49:29 +0000 (17:49 -0700)]
am
9bef412e: am
0011e710: Fix clicking on the total contacts header item.
Merge commit '
9bef412eff75cb8f4d4e8b0b0d2861ce0a52cf80' into eclair-mr2-plus-aosp
* commit '
9bef412eff75cb8f4d4e8b0b0d2861ce0a52cf80':
Fix clicking on the total contacts header item.
Neel Parekh [Thu, 8 Oct 2009 00:45:05 +0000 (17:45 -0700)]
am
0011e710: Fix clicking on the total contacts header item.
Merge commit '
0011e710967a0545b1a5a519eb61f34dcb9db1cb' into eclair-mr2
* commit '
0011e710967a0545b1a5a519eb61f34dcb9db1cb':
Fix clicking on the total contacts header item.
Neel Parekh [Wed, 7 Oct 2009 20:52:38 +0000 (13:52 -0700)]
Fix clicking on the total contacts header item.
Bug:
2160378
Evan Millar [Thu, 8 Oct 2009 00:02:12 +0000 (17:02 -0700)]
am
d2e6989a: am
2a5a27a0: Fix bc_triaged b/issue?id=
2155790
Merge commit '
d2e6989a54d403930e5139026744c7e548bdf85b' into eclair-mr2-plus-aosp
* commit '
d2e6989a54d403930e5139026744c7e548bdf85b':
Fix bc_triaged http://b/issue?id=
2155790
Evan Millar [Thu, 8 Oct 2009 00:02:07 +0000 (17:02 -0700)]
am
92411eb0: am
a1ff78be: Merge change I89190b8b into eclair
Merge commit '
92411eb0ce6019e2f056ec1513202e1e993edbb5' into eclair-mr2-plus-aosp
* commit '
92411eb0ce6019e2f056ec1513202e1e993edbb5':
New photo frame in LARGE QuickCotnact window
Evan Millar [Wed, 7 Oct 2009 23:56:44 +0000 (16:56 -0700)]
am
2a5a27a0: Fix bc_triaged b/issue?id=
2155790
Merge commit '
2a5a27a05085c2e9d3884860970e2c56295de8c9' into eclair-mr2
* commit '
2a5a27a05085c2e9d3884860970e2c56295de8c9':
Fix bc_triaged http://b/issue?id=
2155790
Evan Millar [Wed, 7 Oct 2009 23:56:41 +0000 (16:56 -0700)]
am
a1ff78be: Merge change I89190b8b into eclair
Merge commit '
a1ff78bed118b545e24de6a8f5f2f01f9d0f3d9d' into eclair-mr2
* commit '
a1ff78bed118b545e24de6a8f5f2f01f9d0f3d9d':
New photo frame in LARGE QuickCotnact window
Evan Millar [Wed, 7 Oct 2009 22:15:05 +0000 (15:15 -0700)]
Fix bc_triaged http://b/issue?id=
2155790
Dr.No approval from Tim Sullivan
Change-Id: I893d40499303accbf675c7e7e2e5873b4800b052
Android (Google) Code Review [Wed, 7 Oct 2009 23:48:00 +0000 (19:48 -0400)]
Merge change I89190b8b into eclair
* changes:
New photo frame in LARGE QuickCotnact window
Tadashi G. Takaoka [Wed, 7 Oct 2009 23:35:52 +0000 (16:35 -0700)]
am
35fb5ef3: am
41449696: Merge change Ia961aa60 into eclair
Merge commit '
35fb5ef3f5b58e1e412754599dd321ca74784d9b' into eclair-mr2-plus-aosp
* commit '
35fb5ef3f5b58e1e412754599dd321ca74784d9b':
Contacts: fixed custom label handling in GenericEditorView.
Tadashi G. Takaoka [Wed, 7 Oct 2009 23:30:27 +0000 (16:30 -0700)]
am
41449696: Merge change Ia961aa60 into eclair
Merge commit '
4144969616439687e30d1beec041e6dee951bb37' into eclair-mr2
* commit '
4144969616439687e30d1beec041e6dee951bb37':
Contacts: fixed custom label handling in GenericEditorView.
Android (Google) Code Review [Wed, 7 Oct 2009 23:24:15 +0000 (19:24 -0400)]
Merge change Ia961aa60 into eclair
* changes:
Contacts: fixed custom label handling in GenericEditorView.
Evan Millar [Wed, 7 Oct 2009 22:36:36 +0000 (15:36 -0700)]
New photo frame in LARGE QuickCotnact window
bc_triaged bug: http://b/issue?id=
2170892
Dr.No: Tim Sullivan
Change-Id: I89190b8bf0ba019645c3beb2fe2b73decca0c948
Evan Millar [Wed, 7 Oct 2009 22:02:04 +0000 (15:02 -0700)]
am
f278917d: am
eb0d6997: Merge change I362ca992 into eclair
Merge commit '
f278917d95d8a72bcd6342dd2f591644f0c627a1' into eclair-mr2-plus-aosp
* commit '
f278917d95d8a72bcd6342dd2f591644f0c627a1':
Show message if contact has no data to show.
Evan Millar [Wed, 7 Oct 2009 21:57:16 +0000 (14:57 -0700)]
am
eb0d6997: Merge change I362ca992 into eclair
Merge commit '
eb0d69972dd7b77e3f43146ea5134c7953036ff4' into eclair-mr2
* commit '
eb0d69972dd7b77e3f43146ea5134c7953036ff4':
Show message if contact has no data to show.
Android (Google) Code Review [Wed, 7 Oct 2009 21:46:42 +0000 (17:46 -0400)]
Merge change I362ca992 into eclair
* changes:
Show message if contact has no data to show.
Tadashi G. Takaoka [Wed, 7 Oct 2009 21:28:44 +0000 (14:28 -0700)]
Contacts: fixed custom label handling in GenericEditorView.
Internal Bug: http://b/
2173080
Jeff Hamilton [Wed, 7 Oct 2009 21:21:20 +0000 (16:21 -0500)]
Follow up changes from review of Ib2afc992.
- Fixed some minor issues in the editor comparator
- Fixed some issues with phone local contacts
Change-Id: Ibc1b1f7d23aa33f899eaa4c0a21fde59284b6f4a
Jeff Hamilton [Wed, 7 Oct 2009 20:49:05 +0000 (13:49 -0700)]
am
3abac16d: am
1fb6275a: Updates to the edit contact UI.
Merge commit '
3abac16daad864a65cc33414af407c4e8a46e0d2' into eclair-mr2-plus-aosp
* commit '
3abac16daad864a65cc33414af407c4e8a46e0d2':
Updates to the edit contact UI.
Jeff Hamilton [Wed, 7 Oct 2009 20:44:01 +0000 (13:44 -0700)]
am
1fb6275a: Updates to the edit contact UI.
Merge commit '
1fb6275a57318261cb6dba511954cb754cd17fa2' into eclair-mr2
* commit '
1fb6275a57318261cb6dba511954cb754cd17fa2':
Updates to the edit contact UI.
Jeff Hamilton [Wed, 7 Oct 2009 09:40:27 +0000 (04:40 -0500)]
Updates to the edit contact UI.
- Updated account colors and color layout
- Updated display in read-only mode
- Clearer strings to identify accounts
- Sort the contacts to edit so read-only ones
always are at the bottom.
Fixes
2163539 and a good portion of
2163519.
Change-Id: Ib2afc992a8623f2a253d2a52a0b5c50ee866e5d8
Eric Fischer [Wed, 7 Oct 2009 18:51:59 +0000 (11:51 -0700)]
am
305e2d71: am
0d37e1bb: (-s ours) Merge change Ice23b740 into eclair
Merge commit '
305e2d7192a65e1adfbeb9605529b16c635cd4d7' into eclair-mr2-plus-aosp
* commit '
305e2d7192a65e1adfbeb9605529b16c635cd4d7':
Import revised translations. DO NOT MERGE
Evan Millar [Wed, 7 Oct 2009 18:47:35 +0000 (11:47 -0700)]
Show message if contact has no data to show.
Fixes bc_triaged bug http://b/issue?id=
2170901
Dr.NO approval from Tim Sullivan
Change-Id: I362ca992c3a97792fbc2d76fc3bcf4178bfefcd5
Eric Fischer [Wed, 7 Oct 2009 18:46:28 +0000 (11:46 -0700)]
am
0d37e1bb: (-s ours) Merge change Ice23b740 into eclair
Merge commit '
0d37e1bb98d4fc3a156708225d42f23f6bb27f3d' into eclair-mr2
* commit '
0d37e1bb98d4fc3a156708225d42f23f6bb27f3d':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Wed, 7 Oct 2009 18:36:48 +0000 (14:36 -0400)]
Merge change Ice23b740 into eclair
* changes:
Import revised translations. DO NOT MERGE
Jeff Hamilton [Wed, 7 Oct 2009 03:47:57 +0000 (20:47 -0700)]
am
131deab4: am
d5a4567a: One more last minute string.
Merge commit '
131deab4c76bb4a993e3434c37ebc248b6ee222e' into eclair-mr2-plus-aosp
* commit '
131deab4c76bb4a993e3434c37ebc248b6ee222e':
One more last minute string.
Jeff Hamilton [Wed, 7 Oct 2009 03:42:46 +0000 (20:42 -0700)]
am
d5a4567a: One more last minute string.
Merge commit '
d5a4567ac32a4162e0cd35aa732e2aeb80280cdb' into eclair-mr2
* commit '
d5a4567ac32a4162e0cd35aa732e2aeb80280cdb':
One more last minute string.
Jeff Hamilton [Wed, 7 Oct 2009 03:13:26 +0000 (20:13 -0700)]
am
c366efc4: am
01c68659: Checkpoint new strings for translation.
Merge commit '
c366efc49f8686ccfcdd7b37a612fa10f8687e11' into eclair-mr2-plus-aosp
* commit '
c366efc49f8686ccfcdd7b37a612fa10f8687e11':
Checkpoint new strings for translation.
Costin Manolache [Wed, 7 Oct 2009 03:13:22 +0000 (20:13 -0700)]
am
96435b22: am
76c9ec4b: Part of Bug
2163087 fix - NPE if the main thread is removing the reference.
Merge commit '
96435b228fb4746a75c65c88e041f71412a7b8e0' into eclair-mr2-plus-aosp
* commit '
96435b228fb4746a75c65c88e041f71412a7b8e0':
Part of Bug
2163087 fix - NPE if the main thread is removing the reference.
Dmitri Plotnikov [Wed, 7 Oct 2009 03:13:18 +0000 (20:13 -0700)]
am
cdf93193: am
8debb14b: [Issue
2166752] Properly displaying phone numbers containing letters
Merge commit '
cdf931931403b5f8569676f1416b463a9bb0ff17' into eclair-mr2-plus-aosp
* commit '
cdf931931403b5f8569676f1416b463a9bb0ff17':
[Issue
2166752] Properly displaying phone numbers containing letters
Jeff Hamilton [Wed, 7 Oct 2009 03:12:02 +0000 (22:12 -0500)]
One more last minute string.
Change-Id: Ifc0220ae3af63b0d97b2ae5ab6963108119ded67
Jeff Hamilton [Wed, 7 Oct 2009 03:08:19 +0000 (20:08 -0700)]
am
01c68659: Checkpoint new strings for translation.
Merge commit '
01c68659a500523c32188ef0a3f5eccc7af57652' into eclair-mr2
* commit '
01c68659a500523c32188ef0a3f5eccc7af57652':
Checkpoint new strings for translation.