OSDN Git Service
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.
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 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.
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.
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.
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.
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