OSDN Git Service
Nicolas Catania [Thu, 22 Oct 2009 16:45:59 +0000 (09:45 -0700)]
am
7ac49872: am
970324a6: am
11cd6176: Merge change I7a26b27a into eclair
Merge commit '
7ac49872d1f56aa1ca742356d7a900ab914db433'
* commit '
7ac49872d1f56aa1ca742356d7a900ab914db433':
Fixed the contact's dialer layout.
Nicolas Catania [Thu, 22 Oct 2009 16:45:56 +0000 (09:45 -0700)]
am
a0bba71b: (-s ours) am
6440d4b5: am
67410188: (-s ours) Merge change Ic19d66e9 into eclair
Merge commit '
a0bba71bf1c0474d910e7b9cc883ed3e430f35a1'
* commit '
a0bba71bf1c0474d910e7b9cc883ed3e430f35a1':
Changed the dialed numbers' foreground to be white instead of black.[do not merge]
Nicolas Catania [Thu, 22 Oct 2009 16:33:48 +0000 (09:33 -0700)]
am
970324a6: am
11cd6176: Merge change I7a26b27a into eclair
Merge commit '
970324a6fe1409f245cd96d86e2d28d44c01a16e' into eclair-mr2-plus-aosp
* commit '
970324a6fe1409f245cd96d86e2d28d44c01a16e':
Fixed the contact's dialer layout.
Nicolas Catania [Thu, 22 Oct 2009 16:33:45 +0000 (09:33 -0700)]
am
6440d4b5: am
67410188: (-s ours) Merge change Ic19d66e9 into eclair
Merge commit '
6440d4b5f22614ce1871237241476e4777839672' into eclair-mr2-plus-aosp
* commit '
6440d4b5f22614ce1871237241476e4777839672':
Changed the dialed numbers' foreground to be white instead of black.[do not merge]
Nicolas Catania [Thu, 22 Oct 2009 13:44:25 +0000 (06:44 -0700)]
am
11cd6176: Merge change I7a26b27a into eclair
Merge commit '
11cd6176c9f3dd07be303ac42238b76a1b53b32b' into eclair-mr2
* commit '
11cd6176c9f3dd07be303ac42238b76a1b53b32b':
Fixed the contact's dialer layout.
Nicolas Catania [Thu, 22 Oct 2009 13:44:21 +0000 (06:44 -0700)]
am
67410188: (-s ours) Merge change Ic19d66e9 into eclair
Merge commit '
674101888fcfdf812fe35a404dabe697f2ab7fd1' into eclair-mr2
* commit '
674101888fcfdf812fe35a404dabe697f2ab7fd1':
Changed the dialed numbers' foreground to be white instead of black.[do not merge]
Daisuke Miyakawa [Wed, 21 Oct 2009 23:25:02 +0000 (16:25 -0700)]
am
a94994a7: am
ee7428ae: Fix some comments around vCard so that it should be more descriptive.
Merge commit '
a94994a7ca66cd7c84148eeb82bfd144f91293a3'
* commit '
a94994a7ca66cd7c84148eeb82bfd144f91293a3':
Fix some comments around vCard so that it should be more descriptive.
Daisuke Miyakawa [Wed, 21 Oct 2009 23:20:44 +0000 (16:20 -0700)]
am
ee7428ae: Fix some comments around vCard so that it should be more descriptive.
Merge commit '
ee7428ae89c19ceca59084ca9708f48b8977b6fb' into eclair-mr2-plus-aosp
* commit '
ee7428ae89c19ceca59084ca9708f48b8977b6fb':
Fix some comments around vCard so that it should be more descriptive.
Daisuke Miyakawa [Wed, 21 Oct 2009 23:10:14 +0000 (08:10 +0900)]
Fix some comments around vCard so that it should be more descriptive.
Internal issue number:
2193527
Android (Google) Code Review [Wed, 21 Oct 2009 14:32:34 +0000 (10:32 -0400)]
Merge change I7a26b27a into eclair
* changes:
Fixed the contact's dialer layout.
Android (Google) Code Review [Wed, 21 Oct 2009 14:32:02 +0000 (10:32 -0400)]
Merge change Ic19d66e9 into eclair
* changes:
Changed the dialed numbers' foreground to be white instead of black.[do not merge]
Nicolas Catania [Tue, 13 Oct 2009 16:59:54 +0000 (09:59 -0700)]
Changed the dialed numbers' foreground to be white instead of black.[do not merge]
Bug:
2184896
Nicolas Catania [Tue, 20 Oct 2009 19:36:32 +0000 (12:36 -0700)]
Fixed the contact's dialer layout.
Currently the bottom row is clipped on WVGA-800.
Changes were made to fix the emergency dialer
that needed to be applied to the contact dialer.
Now, the contact dialer uses the same ButtonGridLayout
class which aligns the button at the bottom of the view.
This way we can control the spacing between the last row and
the 'torpedo' accurately.
The rest of the white space is distributed amongst the element
using layout_weight="1".
Tested on VGA, WVGA-854, WVGA-800
Bug:
2198341
Evan Millar [Tue, 20 Oct 2009 18:34:51 +0000 (11:34 -0700)]
am
9fc1f892: am
e9bc3ece: am
81f957d7: Move internal change 29743 into eclair from eclair-mr2
Merge commit '
9fc1f89264c3ecc382c7ca91274489d7b536787a'
* commit '
9fc1f89264c3ecc382c7ca91274489d7b536787a':
Move internal change 29743 into eclair from eclair-mr2
Evan Millar [Tue, 20 Oct 2009 18:29:00 +0000 (11:29 -0700)]
am
e9bc3ece: am
81f957d7: Move internal change 29743 into eclair from eclair-mr2
Merge commit '
e9bc3ecedbfca8f053ff79139690b24d4c23b1d3' into eclair-mr2-plus-aosp
* commit '
e9bc3ecedbfca8f053ff79139690b24d4c23b1d3':
Move internal change 29743 into eclair from eclair-mr2
Evan Millar [Tue, 20 Oct 2009 18:23:34 +0000 (11:23 -0700)]
am
81f957d7: Move internal change 29743 into eclair from eclair-mr2
Merge commit '
81f957d72044232a65e41d0cf219eeaa654632a5' into eclair-mr2
* commit '
81f957d72044232a65e41d0cf219eeaa654632a5':
Move internal change 29743 into eclair from eclair-mr2
Evan Millar [Mon, 12 Oct 2009 22:09:21 +0000 (15:09 -0700)]
Move internal change 29743 into eclair from eclair-mr2
Fixes http://b/viewIssue?id=
2176887
Don't show the keyboard when you enter EditContactActivity
Daisuke Miyakawa [Mon, 19 Oct 2009 22:44:35 +0000 (15:44 -0700)]
am
dc305b60: am
23bf89e6: Fix unkind comments in strings.xml so that translators are able to know more about the message.
Merge commit '
dc305b6027dc478618413abf27e4585d3a4d3c5c'
* commit '
dc305b6027dc478618413abf27e4585d3a4d3c5c':
Fix unkind comments in strings.xml so that translators are able to know more about the message.
Daisuke Miyakawa [Mon, 19 Oct 2009 22:38:22 +0000 (15:38 -0700)]
am
23bf89e6: Fix unkind comments in strings.xml so that translators are able to know more about the message.
Merge commit '
23bf89e643a1103f3d0a955c9e865e1385a2e96b' into eclair-mr2-plus-aosp
* commit '
23bf89e643a1103f3d0a955c9e865e1385a2e96b':
Fix unkind comments in strings.xml so that translators are able to know more about the message.
Daisuke Miyakawa [Mon, 19 Oct 2009 22:28:35 +0000 (07:28 +0900)]
Fix unkind comments in strings.xml so that translators are able to know more about the message.
Internal Issue number:
2193527
Daisuke Miyakawa [Mon, 19 Oct 2009 19:15:23 +0000 (12:15 -0700)]
am
ab582c13: am
cb70acc2: Fix un-helpful description around "un-exportable data"
Merge commit '
ab582c1344a4ee2ed9e2f6665174b05ac867345c'
* commit '
ab582c1344a4ee2ed9e2f6665174b05ac867345c':
Fix un-helpful description around "un-exportable data"
Daisuke Miyakawa [Mon, 19 Oct 2009 19:10:03 +0000 (12:10 -0700)]
am
cb70acc2: Fix un-helpful description around "un-exportable data"
Merge commit '
cb70acc29b45f0872278d1e6963f1f41b3b7d8b2' into eclair-mr2-plus-aosp
* commit '
cb70acc29b45f0872278d1e6963f1f41b3b7d8b2':
Fix un-helpful description around "un-exportable data"
Daisuke Miyakawa [Mon, 19 Oct 2009 05:31:40 +0000 (14:31 +0900)]
Fix un-helpful description around "un-exportable data"
Make the error message related to "un-exportable data" export more descriptive, so that readers
are able to understand what is going on and translaters are also able to understand how to
correctly translate it to each language.
Internal Issue number:
2193527
Paul Berman [Sat, 17 Oct 2009 17:04:25 +0000 (10:04 -0700)]
am
dacfee34: am
614e5784: am
dbdcde26: Allow TwelveKeyDialer call button to send empty flash for CDMA
Merge commit '
dacfee344e42f9063ac03564d10fac7144851474'
* commit '
dacfee344e42f9063ac03564d10fac7144851474':
Allow TwelveKeyDialer call button to send empty flash for CDMA
Paul Berman [Sat, 17 Oct 2009 16:59:20 +0000 (09:59 -0700)]
am
614e5784: am
dbdcde26: Allow TwelveKeyDialer call button to send empty flash for CDMA
Merge commit '
614e578441b94f133a642f2fc45cf3f59fc31122' into eclair-mr2-plus-aosp
* commit '
614e578441b94f133a642f2fc45cf3f59fc31122':
Allow TwelveKeyDialer call button to send empty flash for CDMA
Paul Berman [Sat, 17 Oct 2009 16:54:02 +0000 (09:54 -0700)]
am
dbdcde26: Allow TwelveKeyDialer call button to send empty flash for CDMA
Merge commit '
dbdcde2645f2ba0306b0f3fa08354cddf18a758b' into eclair-mr2
* commit '
dbdcde2645f2ba0306b0f3fa08354cddf18a758b':
Allow TwelveKeyDialer call button to send empty flash for CDMA
Makoto Onuki [Fri, 16 Oct 2009 20:55:19 +0000 (13:55 -0700)]
am
a6d13126: am
c710b0e7: Dedupe same entries in the fasttrack action list.
Merge commit '
a6d13126daeee53d5859f6d33a475afee32dc390'
* commit '
a6d13126daeee53d5859f6d33a475afee32dc390':
Dedupe same entries in the fasttrack action list.
Makoto Onuki [Fri, 16 Oct 2009 20:49:35 +0000 (13:49 -0700)]
am
c710b0e7: Dedupe same entries in the fasttrack action list.
Merge commit '
c710b0e7a7932288763d7e3d08a882ac188303a8' into eclair-mr2-plus-aosp
* commit '
c710b0e7a7932288763d7e3d08a882ac188303a8':
Dedupe same entries in the fasttrack action list.
Makoto Onuki [Tue, 13 Oct 2009 22:43:24 +0000 (15:43 -0700)]
Dedupe same entries in the fasttrack action list.
Fixes b/
2159633.
Paul Berman [Fri, 9 Oct 2009 16:04:10 +0000 (12:04 -0400)]
Allow TwelveKeyDialer call button to send empty flash for CDMA
Currently the TwelveKeyDialer does not allow the user to press the green
call button if the dial text is empty. However, in CDMA when we place a
3-way call in some network infrastructures, you need to send an empty
Flash command to the network before adding the call. The user is accustomed to
pressing the call button in order to do this. Therefore here we make the
changes in TwelveKeyDialer.java required to handle that keypress and send the
blank flash.
Bug:
2179060
Change-Id: Ib8d05459cac708f9dc216412103c1a324d747ecb
Evan Millar [Thu, 15 Oct 2009 23:26:53 +0000 (16:26 -0700)]
am
074d4f9f: am
d30dc674: Fix monkey crasher (bug b/issue?id=
2190035 and http://b/issue?id=
2190875)
Merge commit '
074d4f9f76375570ef2b4fef3d61d79d26775d9b'
* commit '
074d4f9f76375570ef2b4fef3d61d79d26775d9b':
Fix monkey crasher (bug http://b/issue?id=
2190035 and http://b/issue?id=
2190875)
Evan Millar [Thu, 15 Oct 2009 23:21:38 +0000 (16:21 -0700)]
am
d30dc674: Fix monkey crasher (bug b/issue?id=
2190035 and http://b/issue?id=
2190875)
Merge commit '
d30dc6745769e28dd8c4f86f44f529041d793e1f' into eclair-mr2-plus-aosp
* commit '
d30dc6745769e28dd8c4f86f44f529041d793e1f':
Fix monkey crasher (bug http://b/issue?id=
2190035 and http://b/issue?id=
2190875)
Evan Millar [Thu, 15 Oct 2009 22:36:00 +0000 (15:36 -0700)]
Fix monkey crasher (bug b/issue?id=
2190035 and http://b/issue?id=
2190875)
Nicolas Catania [Thu, 15 Oct 2009 15:18:15 +0000 (08:18 -0700)]
am
7cd6cfb5: am
00a1d937: Merge change I933d1c92 into eclair-mr2
Merge commit '
7cd6cfb52c8df13fcb72834dda5377cbc055c8c9'
* commit '
7cd6cfb52c8df13fcb72834dda5377cbc055c8c9':
Changed the dialed numbers' foreground to be white instead of black.
Nicolas Catania [Thu, 15 Oct 2009 15:09:04 +0000 (08:09 -0700)]
am
00a1d937: Merge change I933d1c92 into eclair-mr2
Merge commit '
00a1d937c21c08956c27c38a4ce3978b49fac734' into eclair-mr2-plus-aosp
* commit '
00a1d937c21c08956c27c38a4ce3978b49fac734':
Changed the dialed numbers' foreground to be white instead of black.
Android (Google) Code Review [Thu, 15 Oct 2009 14:56:31 +0000 (10:56 -0400)]
Merge change I933d1c92 into eclair-mr2
* changes:
Changed the dialed numbers' foreground to be white instead of black.
Evan Millar [Wed, 14 Oct 2009 23:51:17 +0000 (16:51 -0700)]
am
10a53f76: am
db72832a: am
aff62dc1: Fix off by one bug in favorites list call button.
Merge commit '
10a53f7632d4954e54c3f5f6b68f692572fe468e'
* commit '
10a53f7632d4954e54c3f5f6b68f692572fe468e':
Fix off by one bug in favorites list call button.
Evan Millar [Wed, 14 Oct 2009 23:46:02 +0000 (16:46 -0700)]
am
db72832a: am
aff62dc1: Fix off by one bug in favorites list call button.
Merge commit '
db72832a3c15f0d3b3a79c6b77fec0c1eef08e58' into eclair-mr2-plus-aosp
* commit '
db72832a3c15f0d3b3a79c6b77fec0c1eef08e58':
Fix off by one bug in favorites list call button.
Evan Millar [Wed, 14 Oct 2009 23:41:27 +0000 (16:41 -0700)]
am
aff62dc1: Fix off by one bug in favorites list call button.
Merge commit '
aff62dc1b044372007d9170290b247b3cf121cfe' into eclair-mr2
* commit '
aff62dc1b044372007d9170290b247b3cf121cfe':
Fix off by one bug in favorites list call button.
Evan Millar [Wed, 14 Oct 2009 23:23:37 +0000 (16:23 -0700)]
Fix off by one bug in favorites list call button.
bc_triaged bug: http://b/issue?id=
2179352
Dr. No: Tim Sullivan
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:18:22 +0000 (16:18 -0700)]
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:17 +0000 (16:02 -0700)]
merge from open-source master
Evan Millar [Wed, 14 Oct 2009 22:35:45 +0000 (15:35 -0700)]
Evan Millar [Wed, 14 Oct 2009 21:26:02 +0000 (14:26 -0700)]
am
6143ec8d: Contacts asset cleanup.
Merge commit '
6143ec8d79516217e75d4af04fa0e6d0db96153b' into eclair-mr2-plus-aosp
* commit '
6143ec8d79516217e75d4af04fa0e6d0db96153b':
Contacts asset cleanup.
Evan Millar [Wed, 14 Oct 2009 18:55:20 +0000 (11:55 -0700)]
Contacts asset cleanup.
These assets should have been deleted when the mdpi version were checked
in.
Evan Millar [Wed, 14 Oct 2009 17:11:12 +0000 (10:11 -0700)]
am
084f7206: am
c73a26a8: Merge change I51ef3ab9 into eclair-mr2
Merge commit '
084f720631a85f964137623c7e53381126b69ceb'
* commit '
084f720631a85f964137623c7e53381126b69ceb':
Don't show the keyboard when you enter EditContactActivity
Evan Millar [Wed, 14 Oct 2009 17:02:00 +0000 (10:02 -0700)]
am
c73a26a8: Merge change I51ef3ab9 into eclair-mr2
Merge commit '
c73a26a89832e6879f158c436447b8e51ffcae5e' into eclair-mr2-plus-aosp
* commit '
c73a26a89832e6879f158c436447b8e51ffcae5e':
Don't show the keyboard when you enter EditContactActivity
Android (Google) Code Review [Wed, 14 Oct 2009 16:56:37 +0000 (12:56 -0400)]
Merge change I51ef3ab9 into eclair-mr2
* changes:
Don't show the keyboard when you enter EditContactActivity
Nicolas Catania [Tue, 13 Oct 2009 16:59:54 +0000 (09:59 -0700)]
Changed the dialed numbers' foreground to be white instead of black.
Bug:
2184896
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.
Jeff Sharkey [Wed, 14 Oct 2009 01:05:27 +0000 (18:05 -0700)]
am
02599216: Remove vertical and colored bars from editors.
Merge commit '
02599216bc39ca58754d5f3731a02dfd3d112964' into eclair-plus-aosp
* 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.
Evan Millar [Mon, 12 Oct 2009 22:09:21 +0000 (15:09 -0700)]
Don't show the keyboard when you enter EditContactActivity
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:47:13 +0000 (13:47 -0700)]
am
7bec22d9: Merge change I43723de2 into eclair
Merge commit '
7bec22d9cb610827b4c5f5fcbc1678e1344a2637' into eclair-plus-aosp
* commit '
7bec22d9cb610827b4c5f5fcbc1678e1344a2637':
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:36 +0000 (13:41 -0700)]
am
da4e4832: Merge change I1cde5dd0 into eclair
Merge commit '
da4e4832cf1b3789201d00f9970bd0b43d775366' into eclair-plus-aosp
* commit '
da4e4832cf1b3789201d00f9970bd0b43d775366':
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.