OSDN Git Service
Jeff Sharkey [Wed, 14 Oct 2009 01:14:28 +0000 (18:14 -0700)]
am
c3f36826: am
ce69c659: am
02599216: Remove vertical and colored bars from editors.
Merge commit '
c3f368267d35e5608472e75dcfe9d9a82a8563e8'
* commit '
c3f368267d35e5608472e75dcfe9d9a82a8563e8':
Remove vertical and colored bars from editors.
Jeff Sharkey [Wed, 14 Oct 2009 01:09:59 +0000 (18:09 -0700)]
am
ce69c659: am
02599216: Remove vertical and colored bars from editors.
Merge commit '
ce69c659e060e7e1585cb0095907c51e60c9816b' into eclair-mr2-plus-aosp
* commit '
ce69c659e060e7e1585cb0095907c51e60c9816b':
Remove vertical and colored bars from editors.
Jeff Sharkey [Wed, 14 Oct 2009 01:05:34 +0000 (18:05 -0700)]
am
02599216: Remove vertical and colored bars from editors.
Merge commit '
02599216bc39ca58754d5f3731a02dfd3d112964' into eclair-mr2
* commit '
02599216bc39ca58754d5f3731a02dfd3d112964':
Remove vertical and colored bars from editors.
Eric Fischer [Wed, 14 Oct 2009 00:17:41 +0000 (17:17 -0700)]
am
97f70a31: (-s ours) am
a32f03d4: Import revised translations. DO NOT MERGE
Merge commit '
97f70a31425231a494b3ea7d2c6641f1e2dc1ca5'
* commit '
97f70a31425231a494b3ea7d2c6641f1e2dc1ca5':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 14 Oct 2009 00:05:42 +0000 (17:05 -0700)]
am
a32f03d4: Import revised translations. DO NOT MERGE
Merge commit '
a32f03d47b877e9036b5bba9caec8498fe0dad20' into eclair-mr2-plus-aosp
* commit '
a32f03d47b877e9036b5bba9caec8498fe0dad20':
Import revised translations. DO NOT MERGE
Jeff Sharkey [Wed, 14 Oct 2009 00:02:42 +0000 (17:02 -0700)]
am
d4d53628: am
3fbeea48: am
7bec22d9: Merge change I43723de2 into eclair
Merge commit '
d4d53628bfe432b44afa339e4b89661a10247536'
* commit '
d4d53628bfe432b44afa339e4b89661a10247536':
Avoid setting checked state when dismissing FastTrack.
Nicolas Catania [Wed, 14 Oct 2009 00:02:39 +0000 (17:02 -0700)]
am
823fd103: (-s ours) am
0b2b0ad2: am
da4e4832: (-s ours) Merge change I1cde5dd0 into eclair
Merge commit '
823fd103ba19217a8ee7ba481944d9d639e51aa7'
* commit '
823fd103ba19217a8ee7ba481944d9d639e51aa7':
In landscape mode, set the type of digit area to PHONE[do not merge].
Jeff Hamilton [Wed, 14 Oct 2009 00:01:41 +0000 (17:01 -0700)]
am
dd1f3c73: am
44d99c67: am
4bef56bd: Show phones and email addresses for read-only contacts.
Merge commit '
dd1f3c7322b6bec394f9124246436f57abf4b441'
* commit '
dd1f3c7322b6bec394f9124246436f57abf4b441':
Show phones and email addresses for read-only contacts.
Eric Fischer [Tue, 13 Oct 2009 23:55:31 +0000 (16:55 -0700)]
am
a7d12b1b: (-s ours) am
fcf5f4c9: am
387a22c7: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
a7d12b1be935c694264958a96a80d39d1fcc5dba'
* commit '
a7d12b1be935c694264958a96a80d39d1fcc5dba':
Import revised translations. DO NOT MERGE
Nicolas Catania [Tue, 13 Oct 2009 23:55:14 +0000 (16:55 -0700)]
am
9a6fac91: am
a6ecc0ed: Merge change Ieb30191a into eclair-mr2
Merge commit '
9a6fac910027165ae6c7ac9770cb8d86fc327a98'
* commit '
9a6fac910027165ae6c7ac9770cb8d86fc327a98':
In landscape mode, set the type of digit area to PHONE.
Evan Millar [Tue, 13 Oct 2009 23:52:44 +0000 (16:52 -0700)]
am
e5847edf: am
0641d14c: am
0c035143: Clear bitmap cache in onResume() to make sure photos are fresh.
Merge commit '
e5847edf2514f0ad2798a2e99aad001cccf2491b'
* commit '
e5847edf2514f0ad2798a2e99aad001cccf2491b':
Clear bitmap cache in onResume() to make sure photos are fresh.
Eric Fischer [Tue, 13 Oct 2009 23:32:28 +0000 (16:32 -0700)]
Reimport translations.
Change-Id: Ic5a6f9b2c0f8f56c5689d2b7a6a0ab7a4a40b6f4
Jeff Sharkey [Tue, 13 Oct 2009 23:27:09 +0000 (16:27 -0700)]
Remove vertical and colored bars from editors.
Fixes http://b/
2186076
Eric Fischer [Tue, 13 Oct 2009 23:05:38 +0000 (16:05 -0700)]
Import revised translations. DO NOT MERGE
android-build SharedAccount [Tue, 13 Oct 2009 21:22:33 +0000 (14:22 -0700)]
resolved conflicts for merge of
f6925aae to master (skipped res/values-es-rUS/strings.xml)
Jeff Sharkey [Tue, 13 Oct 2009 19:10:51 +0000 (12:10 -0700)]
am
0289efad: am
37164a25: am
4c82d3b7: Handle external sources that request both social and detail.
Merge commit '
0289efad24ec666b9f24cc24ab9cd1d2c459d8d9'
* commit '
0289efad24ec666b9f24cc24ab9cd1d2c459d8d9':
Handle external sources that request both social and detail.
Jeff Sharkey [Tue, 13 Oct 2009 19:02:56 +0000 (12:02 -0700)]
am
f587b675: am
cebe59f7: am
bbaf565e: New infobar background assets.
Merge commit '
f587b6757760c77d74d89c3554ac0188bf6d0c5a'
* commit '
f587b6757760c77d74d89c3554ac0188bf6d0c5a':
New infobar background assets.
Evan Millar [Tue, 13 Oct 2009 19:02:52 +0000 (12:02 -0700)]
am
3f9aaee0: am
c9b077c2: am
31e197bf: Merge change I3ee009e6 into eclair
Merge commit '
3f9aaee0ce89885bafc5581fa18db657113522b1'
* commit '
3f9aaee0ce89885bafc5581fa18db657113522b1':
Make shortcut icons adjust to hdpi display.
Eric Fischer [Tue, 13 Oct 2009 19:02:48 +0000 (12:02 -0700)]
am
f1c4c625: (-s ours) am
d8de5142: am
43ce4049: (-s ours) am
906af3fb: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
f1c4c6257ecb07c56cc11b832fd4cf83eb7e652c'
* commit '
f1c4c6257ecb07c56cc11b832fd4cf83eb7e652c':
Import revised translations. DO NOT MERGE
Jeff Sharkey [Tue, 13 Oct 2009 19:02:44 +0000 (12:02 -0700)]
am
a695b7d6: am
166ab1cb: am
e31dac84: Trim edit fields that don\'t contain printable values.
Merge commit '
a695b7d693e6d67258f1b0804d2d2fc53646aa8a'
* commit '
a695b7d693e6d67258f1b0804d2d2fc53646aa8a':
Trim edit fields that don't contain printable values.
Jeff Sharkey [Tue, 13 Oct 2009 19:02:40 +0000 (12:02 -0700)]
am
e6a946e7: am
10c3834b: am
b7da2d0f: Allow omission of RES_PACKAGE for status attributions.
Merge commit '
e6a946e75a52e0fb8ee0e16a3a8687e843ee9a61'
* commit '
e6a946e75a52e0fb8ee0e16a3a8687e843ee9a61':
Allow omission of RES_PACKAGE for status attributions.
Makoto Onuki [Tue, 13 Oct 2009 18:59:33 +0000 (11:59 -0700)]
am
43803712: am
d708e555: Merge change I94ee30d0 into eclair-mr2
Merge commit '
43803712058ee9d4ac4dce114d9f1cf9e3be7ca5'
* commit '
43803712058ee9d4ac4dce114d9f1cf9e3be7ca5':
Fix the layout issue reported in b/
2167690
Makoto Onuki [Tue, 13 Oct 2009 18:59:12 +0000 (11:59 -0700)]
am
7e772ea3: am
c9eb522e: Merge change I44f9de96 into eclair-mr2
Merge commit '
7e772ea31e357e3936e64ef8d1ad8217c7e9e34e'
* commit '
7e772ea31e357e3936e64ef8d1ad8217c7e9e34e':
Don't crash even when voiceMailNumber is null, which is a valid condition.
Daisuke Miyakawa [Tue, 13 Oct 2009 18:58:18 +0000 (11:58 -0700)]
am
bfff1a29: am
5a08181f: Merge change Icf3aa797 into eclair-mr2
Merge commit '
bfff1a29c4af92c6999abb67d21db0eab2d722f3'
* commit '
bfff1a29c4af92c6999abb67d21db0eab2d722f3':
Clean-up ImportVCardActivity and ExportVCardActivity
Evan Millar [Tue, 13 Oct 2009 18:57:20 +0000 (11:57 -0700)]
am
1b51d759: am
becfee4a: Don\'t show a call button in the favorites list if the contact doesn\'t have a phone number
Merge commit '
1b51d7594cb52dd255cce7a6552f220aa0c41be3'
* commit '
1b51d7594cb52dd255cce7a6552f220aa0c41be3':
Don't show a call button in the favorites list if the contact doesn't have a phone number
Evan Millar [Tue, 13 Oct 2009 18:56:09 +0000 (11:56 -0700)]
am
c28624ee: am
65c8cf18: am
43455184: Handle IM entries with missing protocol field.
Merge commit '
c28624ee2c856c7fed3e45e69550be0ff1452216'
* commit '
c28624ee2c856c7fed3e45e69550be0ff1452216':
Handle IM entries with missing protocol field.
Jeff Sharkey [Tue, 13 Oct 2009 18:56:05 +0000 (11:56 -0700)]
am
e071fbce: am
a37c8e89: am
cee3b66d: Omit attribution icon in medium FastTrack.
Merge commit '
e071fbce8072f9d127f171d5d4900d3b65939b5e'
* commit '
e071fbce8072f9d127f171d5d4900d3b65939b5e':
Omit attribution icon in medium FastTrack.
Daisuke Miyakawa [Tue, 13 Oct 2009 18:56:02 +0000 (11:56 -0700)]
am
f575f1d4: am
7c7457cf: am
2db67f79: Merge change I652a8d7b into eclair
Merge commit '
f575f1d4db17a9c98d01a47dd9cd9323e91f75ee'
* commit '
f575f1d4db17a9c98d01a47dd9cd9323e91f75ee':
Fix ImportVCardActivity so that NPE will never occur during import.
Jeff Sharkey [Tue, 13 Oct 2009 18:55:18 +0000 (11:55 -0700)]
am
6b256004: am
8161085e: am
71737051: Ignore transient rows during re-parenting.
Merge commit '
6b25600405fb37645b7da608029fbf3470a93104'
* commit '
6b25600405fb37645b7da608029fbf3470a93104':
Ignore transient rows during re-parenting.
Jeff Sharkey [Tue, 13 Oct 2009 18:54:31 +0000 (11:54 -0700)]
am
085cde2a: am
5858728f: am
4c129c92: Increment tries as we reparent to avoid looping.
Merge commit '
085cde2aad73394739dbe98cf2517c5a9691ba57'
* commit '
085cde2aad73394739dbe98cf2517c5a9691ba57':
Increment tries as we reparent to avoid looping.
Jeff Hamilton [Tue, 13 Oct 2009 18:48:51 +0000 (11:48 -0700)]
am
9dd267d4: am
9b241b1b: am
54b3e1fc: Merge change Ibc1b1f7d into eclair
Merge commit '
9dd267d438edf2858ab8cb85e117c359d2538517'
* commit '
9dd267d438edf2858ab8cb85e117c359d2538517':
Follow up changes from review of Ib2afc992.
Jeff Sharkey [Mon, 12 Oct 2009 20:52:00 +0000 (13:52 -0700)]
am
3fbeea48: am
7bec22d9: Merge change I43723de2 into eclair
Merge commit '
3fbeea48f19ac5e758d6b19ad6d6462155f2ff58' into eclair-mr2-plus-aosp
* commit '
3fbeea48f19ac5e758d6b19ad6d6462155f2ff58':
Avoid setting checked state when dismissing FastTrack.
Jeff Sharkey [Mon, 12 Oct 2009 20:46:45 +0000 (13:46 -0700)]
am
7bec22d9: Merge change I43723de2 into eclair
Merge commit '
7bec22d9cb610827b4c5f5fcbc1678e1344a2637' into eclair-mr2
* commit '
7bec22d9cb610827b4c5f5fcbc1678e1344a2637':
Avoid setting checked state when dismissing FastTrack.
Nicolas Catania [Mon, 12 Oct 2009 20:46:24 +0000 (13:46 -0700)]
am
0b2b0ad2: am
da4e4832: (-s ours) Merge change I1cde5dd0 into eclair
Merge commit '
0b2b0ad2207b457d6704372c9ca1dda2ac46fce5' into eclair-mr2-plus-aosp
* commit '
0b2b0ad2207b457d6704372c9ca1dda2ac46fce5':
In landscape mode, set the type of digit area to PHONE[do not merge].
Nicolas Catania [Mon, 12 Oct 2009 20:41:13 +0000 (13:41 -0700)]
am
da4e4832: (-s ours) Merge change I1cde5dd0 into eclair
Merge commit '
da4e4832cf1b3789201d00f9970bd0b43d775366' into eclair-mr2
* commit '
da4e4832cf1b3789201d00f9970bd0b43d775366':
In landscape mode, set the type of digit area to PHONE[do not merge].
Android (Google) Code Review [Mon, 12 Oct 2009 20:39:28 +0000 (16:39 -0400)]
Merge change I43723de2 into eclair
* changes:
Avoid setting checked state when dismissing FastTrack.
Android (Google) Code Review [Mon, 12 Oct 2009 20:34:46 +0000 (16:34 -0400)]
Merge change I1cde5dd0 into eclair
* changes:
In landscape mode, set the type of digit area to PHONE[do not merge].
Dmitri Plotnikov [Mon, 12 Oct 2009 19:42:09 +0000 (12:42 -0700)]
am
fb06cb5e: am
40332ac1: am
406ae422: [Issue
2174171] Fixing Join Contact UI title.
Merge commit '
fb06cb5ef80380601bb419fbfa5b29f570fcc5ff'
* commit '
fb06cb5ef80380601bb419fbfa5b29f570fcc5ff':
[Issue
2174171] Fixing Join Contact UI title.
Neel Parekh [Mon, 12 Oct 2009 19:41:23 +0000 (12:41 -0700)]
am
4e9227b6: am
9bef412e: am
0011e710: Fix clicking on the total contacts header item.
Merge commit '
4e9227b6519b3885ebc872312037214470762bc3'
* commit '
4e9227b6519b3885ebc872312037214470762bc3':
Fix clicking on the total contacts header item.
Evan Millar [Mon, 12 Oct 2009 19:39:47 +0000 (12:39 -0700)]
Evan Millar [Mon, 12 Oct 2009 19:39:43 +0000 (12:39 -0700)]
am
148e12f1: am
92411eb0: am
a1ff78be: Merge change I89190b8b into eclair
Merge commit '
148e12f103cfb6fd4b41840ad4b615ea43027687'
* commit '
148e12f103cfb6fd4b41840ad4b615ea43027687':
New photo frame in LARGE QuickCotnact window
Tadashi G. Takaoka [Mon, 12 Oct 2009 19:38:21 +0000 (12:38 -0700)]
am
1a900930: am
35fb5ef3: am
41449696: Merge change Ia961aa60 into eclair
Merge commit '
1a900930b3865c8315f3686a1db09b8cee7c726e'
* commit '
1a900930b3865c8315f3686a1db09b8cee7c726e':
Contacts: fixed custom label handling in GenericEditorView.
Evan Millar [Mon, 12 Oct 2009 19:35:43 +0000 (12:35 -0700)]
am
d5e916da: am
f278917d: am
eb0d6997: Merge change I362ca992 into eclair
Merge commit '
d5e916da16717d6b1df16fd00b3324379d00e5f5'
* commit '
d5e916da16717d6b1df16fd00b3324379d00e5f5':
Show message if contact has no data to show.
Jeff Hamilton [Mon, 12 Oct 2009 19:33:36 +0000 (12:33 -0700)]
am
c9e3ded3: am
3abac16d: am
1fb6275a: Updates to the edit contact UI.
Merge commit '
c9e3ded3a8cddd07c3c788caa5c458e9de10acb0'
* commit '
c9e3ded3a8cddd07c3c788caa5c458e9de10acb0':
Updates to the edit contact UI.
Eric Fischer [Mon, 12 Oct 2009 19:31:18 +0000 (12:31 -0700)]
am
f79a18cb: (-s ours) am
305e2d71: am
0d37e1bb: (-s ours) Merge change Ice23b740 into eclair
Merge commit '
f79a18cb1aba4cdab9530104e98d88d458bffba6'
* commit '
f79a18cb1aba4cdab9530104e98d88d458bffba6':
Import revised translations. DO NOT MERGE
Jeff Hamilton [Mon, 12 Oct 2009 19:27:34 +0000 (12:27 -0700)]
Jeff Hamilton [Mon, 12 Oct 2009 19:27:29 +0000 (12:27 -0700)]
am
567c86e7: am
c366efc4: am
01c68659: Checkpoint new strings for translation.
Merge commit '
567c86e7165f3c36a9a51d2714f462859e3b3db9'
* commit '
567c86e7165f3c36a9a51d2714f462859e3b3db9':
Checkpoint new strings for translation.
Costin Manolache [Mon, 12 Oct 2009 19:27:25 +0000 (12:27 -0700)]
am
da5ea21c: am
96435b22: am
76c9ec4b: Part of Bug
2163087 fix - NPE if the main thread is removing the reference.
Merge commit '
da5ea21c3cbedb4d9ba079c253220c5c6b576f51'
* commit '
da5ea21c3cbedb4d9ba079c253220c5c6b576f51':
Part of Bug
2163087 fix - NPE if the main thread is removing the reference.
Dmitri Plotnikov [Mon, 12 Oct 2009 19:27:21 +0000 (12:27 -0700)]
am
9d8c358c: am
cdf93193: am
8debb14b: [Issue
2166752] Properly displaying phone numbers containing letters
Merge commit '
9d8c358caca739810c387d0f383aa37c0a87328a'
* commit '
9d8c358caca739810c387d0f383aa37c0a87328a':
[Issue
2166752] Properly displaying phone numbers containing letters
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
Jeff Sharkey [Mon, 12 Oct 2009 18:49:13 +0000 (11:49 -0700)]
am
8984f6a6: am
36ef0608: am
d1037fdb: Merge change I9a8a3d9d into eclair
Merge commit '
8984f6a61a289f38e122889863903fbeb0d3e37f'
* commit '
8984f6a61a289f38e122889863903fbeb0d3e37f':
Fix FastTrack recycling consistency issues, shadows.
Evan Millar [Mon, 12 Oct 2009 18:47:34 +0000 (11:47 -0700)]
am
d4aecbec: am
a03fb550: am
3075f6a4: Display empty text when there are no contacts visible.
Merge commit '
d4aecbec8b0dc1f8ca0f6d4170f09dd5852c06b5'
* commit '
d4aecbec8b0dc1f8ca0f6d4170f09dd5852c06b5':
Display empty text when there are no contacts visible.
Jeff Sharkey [Mon, 12 Oct 2009 18:43:30 +0000 (11:43 -0700)]
am
21e30960: am
3d9a3209: am
685fdd50: Merge change I23d84a63 into eclair
Merge commit '
21e30960e500b4d2eac5f35eb232e363f0739da4'
* commit '
21e30960e500b4d2eac5f35eb232e363f0739da4':
Include Google Talk presence, even when missing Im rows.
Costin Manolache [Mon, 12 Oct 2009 18:43:25 +0000 (11:43 -0700)]
am
25bb7b4e: am
4bd352d5: am
c759ffbc: Merge change I740cfdad into eclair
Merge commit '
25bb7b4eb0351b7fab4eb1469182d7b3d2833b30'
* commit '
25bb7b4eb0351b7fab4eb1469182d7b3d2833b30':
Use a thread pool to fetch images. Bug
2163087.
Megha Joshi [Mon, 12 Oct 2009 18:43:21 +0000 (11:43 -0700)]
am
5758feca: am
0b9d552c: am
d40d7f06: Merge change I6238c621 into eclair
Merge commit '
5758feca53f6fc9331dece21c05f2711a0a96606'
* commit '
5758feca53f6fc9331dece21c05f2711a0a96606':
Prevents empty focus contacts without photo from being created.
Megha Joshi [Mon, 12 Oct 2009 18:43:17 +0000 (11:43 -0700)]
am
e4ad1251: Prevents empty focus contacts without photo from being created.
Merge commit '
e4ad125110d1a9bc5e9cc50097953f7af3c85c67'
* commit '
e4ad125110d1a9bc5e9cc50097953f7af3c85c67':
Prevents empty focus contacts without photo from being created.
Nicolas Catania [Fri, 9 Oct 2009 18:09:45 +0000 (11:09 -0700)]
In landscape mode, set the type of digit area to PHONE[do not merge].
Backport from Ieb30191ace8a0d62adec4feaca8f81df7ac4e71b
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:
2180808
Evan Millar [Mon, 12 Oct 2009 18:40:37 +0000 (11:40 -0700)]
am
0ba6b433: am
1c917836: am
585e10f7: Merge change Ifb476198 into eclair
Merge commit '
0ba6b4338b8e5c9468debe0c83acbe4166e39f2f'
* commit '
0ba6b4338b8e5c9468debe0c83acbe4166e39f2f':
Use framework assets for section headers, and adjust layout to pixel perfect.
Daniel Sandler [Mon, 12 Oct 2009 18:39:46 +0000 (11:39 -0700)]
Dmitri Plotnikov [Mon, 12 Oct 2009 18:37:07 +0000 (11:37 -0700)]
am
62ccda12: am
55aac855: am
8577fee2: Merge change I517b266a into eclair
Merge commit '
62ccda12556fc25b6ad1138fc159646eb45c371b'
* commit '
62ccda12556fc25b6ad1138fc159646eb45c371b':
[Issue
2165144] Fixing managed delete dialogs in ContactListActivity
Jeff Sharkey [Mon, 12 Oct 2009 18:34:59 +0000 (11:34 -0700)]
am
fecde67e: am
3abc38af: am
5cbf6f43: Exclude FastTrack window from recent apps.
Merge commit '
fecde67e685c95a0180e956ff3df478345fdfd99'
* commit '
fecde67e685c95a0180e956ff3df478345fdfd99':
Exclude FastTrack window from recent apps.
Neel Parekh [Mon, 12 Oct 2009 18:34:29 +0000 (11:34 -0700)]
am
13c29c6d: am
59afce1d: am
cf1af9a1: Merge change I14fec660 into eclair
Merge commit '
13c29c6df6f801de413bc25b73500a0b97ab1a72'
* commit '
13c29c6df6f801de413bc25b73500a0b97ab1a72':
Fix NPE being thrown when starting the AttachImage activity.
Daisuke Miyakawa [Mon, 12 Oct 2009 18:31:40 +0000 (11:31 -0700)]
am
111c3077: am
f62d58fc: Merge change I806ebb68 into eclair-mr2
Merge commit '
111c307707e90f8807a0ffff19c3ea325235a276'
* commit '
111c307707e90f8807a0ffff19c3ea325235a276':
Use VCardDataBuilder#cancel().
Fred Quintana [Mon, 12 Oct 2009 18:28:59 +0000 (11:28 -0700)]
am
8ef0e202: am
5fbf1d61: am
8e55e0da: account manager api review changes
Merge commit '
8ef0e202aa602fcb80878370c26bf5ec0aac76d2'
* commit '
8ef0e202aa602fcb80878370c26bf5ec0aac76d2':
account manager api review changes
Bjorn Bringert [Mon, 12 Oct 2009 18:28:55 +0000 (11:28 -0700)]
am
af167ba9: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Contacts into eclair-mr2-plus-aosp
Merge commit '
af167ba9e71fec452a1579aa38d2849957d04843'
* commit '
af167ba9e71fec452a1579aa38d2849957d04843':
Nicolas Catania [Mon, 12 Oct 2009 18:13:23 +0000 (11:13 -0700)]
am
05dd65b1: am
d7a3cd59: Merge change I3040fa30 into eclair
Merge commit '
05dd65b1e86aa5f33fde5b3a197bdd392188f528'
* commit '
05dd65b1e86aa5f33fde5b3a197bdd392188f528':
Taping the dialed number allows editing.
Megha Joshi [Mon, 12 Oct 2009 18:13:19 +0000 (11:13 -0700)]
am
c847b3d1: am
c508bd8c: Fixes bug where delete option from Menu list is disabled in Contact view mode. Bug was caused by the count increment logic being removed in the next submitted change https://android-git.corp.google.com/w/?p=platform/packages/apps/Contacts.git
Merge commit '
c847b3d1c3141a5d1f440eaf7fb81f352cfa8e76'
* commit '
c847b3d1c3141a5d1f440eaf7fb81f352cfa8e76':
Fixes bug where delete option from Menu list is disabled in Contact view mode.
Dmitri Plotnikov [Mon, 12 Oct 2009 18:13:15 +0000 (11:13 -0700)]
am
5b37d621: am
f042df95: [Issue
2157935] Adding a confirmation dialog for contact split.
Merge commit '
5b37d6210524a15b7bf6bc7238b774730a9e3584'
* commit '
5b37d6210524a15b7bf6bc7238b774730a9e3584':
[Issue
2157935] Adding a confirmation dialog for contact split.
Dmitri Plotnikov [Mon, 12 Oct 2009 18:13:11 +0000 (11:13 -0700)]
am
e2461343: am
b8594f27: [Issue
2161366] Changing strings for total number of contacts displayed
Merge commit '
e24613437df404d66c255ec544027b1ea9b9a0d1'
* commit '
e24613437df404d66c255ec544027b1ea9b9a0d1':
[Issue
2161366] Changing strings for total number of contacts displayed
Jeff Sharkey [Mon, 12 Oct 2009 18:13:07 +0000 (11:13 -0700)]
am
084607c3: am
e1032fa1: Dismiss FastTrack only after calling startActivity().
Merge commit '
084607c3d4c0ff993bb72a001091c412d3de1e92'
* commit '
084607c3d4c0ff993bb72a001091c412d3de1e92':
Dismiss FastTrack only after calling startActivity().
Neel Parekh [Mon, 12 Oct 2009 18:13:02 +0000 (11:13 -0700)]
am
55472240: am
6c0f8cf8: Fix attaching image on "new contact" screen.
Merge commit '
55472240fbad3cf0442c56b43f2bcdcd68be71c5'
* commit '
55472240fbad3cf0442c56b43f2bcdcd68be71c5':
Fix attaching image on "new contact" screen.
Mike Cleron [Mon, 12 Oct 2009 18:12:58 +0000 (11:12 -0700)]
Eric Fischer [Mon, 12 Oct 2009 18:12:53 +0000 (11:12 -0700)]
am
7581a68b: (-s ours) am
eb3c86d7: (-s ours) Merge change I08582aef into eclair
Merge commit '
7581a68be376b442a12cbcd326e861e8d02cb6de'
* commit '
7581a68be376b442a12cbcd326e861e8d02cb6de':
Import revised translations. DO NOT MERGE
Dmitri Plotnikov [Mon, 12 Oct 2009 18:12:49 +0000 (11:12 -0700)]
am
be7496af: am
f3bd80a2: [Issue
2153296] Updating contact list section headers
Merge commit '
be7496af07952273a64e811c32d5428a4c292441'
* commit '
be7496af07952273a64e811c32d5428a4c292441':
[Issue
2153296] Updating contact list section headers
Evan Millar [Mon, 12 Oct 2009 18:12:45 +0000 (11:12 -0700)]
Daisuke Miyakawa [Mon, 12 Oct 2009 18:12:40 +0000 (11:12 -0700)]
am
5bc8b5ae: Fix ImportVCardActivity so that NPE will never occur during import.
Merge commit '
5bc8b5ae64650e1a62d0b676b34c3f150631c951'
* commit '
5bc8b5ae64650e1a62d0b676b34c3f150631c951':
Fix ImportVCardActivity so that NPE will never occur during import.
Jeff Sharkey [Mon, 12 Oct 2009 17:50:08 +0000 (10:50 -0700)]
Avoid setting checked state when dismissing FastTrack.
Fixes http://b/
2180222
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.