OSDN Git Service
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: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: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: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
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: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: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 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: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: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: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: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:02:17 +0000 (16:02 -0700)]
merge from open-source master
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: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: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: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 [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
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].
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:01:31 +0000 (12:01 -0700)]
am
4bef56bd: Show phones and email addresses for read-only contacts.
Merge commit '
4bef56bdbde4c6bd439ed2d528d4b99974359e18' into eclair-plus-aosp
* commit '
4bef56bdbde4c6bd439ed2d528d4b99974359e18':
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
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
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 23:07:42 +0000 (16:07 -0700)]
am
387a22c7: Import revised translations. DO NOT MERGE
Merge commit '
387a22c79782ddb6bea57d1f80ec227f0842a253' into eclair-plus-aosp
* 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:56 +0000 (12:58 -0700)]
am
0c035143: Clear bitmap cache in onResume() to make sure photos are fresh.
Merge commit '
0c035143ed4dee093bbfa3b8bdcda2ddf3fdb528' into eclair-plus-aosp
* commit '
0c035143ed4dee093bbfa3b8bdcda2ddf3fdb528':
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.
Jeff Hamilton [Fri, 9 Oct 2009 04:55:50 +0000 (21:55 -0700)]
am
dbb924c4: Merge change I700622d9 into eclair
Merge commit '
dbb924c493b8fffd8f7f0d2172953ba5c2b2c7a5' into eclair-plus-aosp
* 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 03:13:32 +0000 (20:13 -0700)]
am
4c82d3b7: Handle external sources that request both social and detail.
Merge commit '
4c82d3b7323b498e2a21daf94505daf0cd32d212' into eclair-plus-aosp
* 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:58:14 +0000 (16:58 -0700)]
am
bbaf565e: New infobar background assets.
Merge commit '
bbaf565e69b9d074c9ef4713e032dda7b7cdacaf' into eclair-plus-aosp
* commit '
bbaf565e69b9d074c9ef4713e032dda7b7cdacaf':
New infobar background assets.
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
Evan Millar [Thu, 8 Oct 2009 22:13:25 +0000 (15:13 -0700)]
am
31e197bf: Merge change I3ee009e6 into eclair
Merge commit '
31e197bfdb4f94099c632dc89245b3b4711eb3cb' into eclair-plus-aosp
* commit '
31e197bfdb4f94099c632dc89245b3b4711eb3cb':
Make shortcut icons adjust to hdpi display.
Eric Fischer [Thu, 8 Oct 2009 22:13:22 +0000 (15:13 -0700)]
am
43ce4049: am
906af3fb: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
43ce404918a6d7de76e3d4c7057f6c804e377a36' into eclair-plus-aosp
* commit '
43ce404918a6d7de76e3d4c7057f6c804e377a36':
Import revised translations. DO NOT MERGE
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.
Jeff Sharkey [Thu, 8 Oct 2009 21:47:10 +0000 (14:47 -0700)]
am
e31dac84: Trim edit fields that don\'t contain printable values.
Merge commit '
e31dac84479a4c7b356edfc062a447cdfb5efc69' into eclair-plus-aosp
* commit '
e31dac84479a4c7b356edfc062a447cdfb5efc69':
Trim edit fields that don't contain printable values.
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
Jeff Sharkey [Thu, 8 Oct 2009 18:39:44 +0000 (11:39 -0700)]
am
b7da2d0f: Allow omission of RES_PACKAGE for status attributions.
Merge commit '
b7da2d0f30e012f786686bedea065af01f20a4e2' into eclair-plus-aosp
* commit '
b7da2d0f30e012f786686bedea065af01f20a4e2':
Allow omission of RES_PACKAGE for status attributions.