OSDN Git Service
Jean-Baptiste Queru [Mon, 9 Nov 2009 17:42:08 +0000 (09:42 -0800)]
merge from open-source master
Eric Fischer [Sat, 7 Nov 2009 00:15:32 +0000 (16:15 -0800)]
am
a03863ca: Import revised translations. DO NOT MERGE
Merge commit '
a03863ca00ec1fe7309ae9d81f383f84c869ffd8' into eclair-mr2-plus-aosp
* commit '
a03863ca00ec1fe7309ae9d81f383f84c869ffd8':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 6 Nov 2009 23:27:08 +0000 (15:27 -0800)]
Import revised translations. DO NOT MERGE
Nicolas Catania [Fri, 6 Nov 2009 22:09:32 +0000 (14:09 -0800)]
am
e2cf8100: am
9bcf470c: Added VIBRATE permission to allow haptic feedback.
Merge commit '
e2cf8100a2c1c4403f8e543540a67c089ea8493c' into eclair-mr2-plus-aosp
* commit '
e2cf8100a2c1c4403f8e543540a67c089ea8493c':
Added VIBRATE permission to allow haptic feedback.
Nicolas Catania [Fri, 6 Nov 2009 22:04:01 +0000 (14:04 -0800)]
am
9bcf470c: Added VIBRATE permission to allow haptic feedback.
Merge commit '
9bcf470c6ed7210887a0442f7e25ca050e6375d6' into eclair-mr2
* commit '
9bcf470c6ed7210887a0442f7e25ca050e6375d6':
Added VIBRATE permission to allow haptic feedback.
Nicolas Catania [Fri, 6 Nov 2009 21:19:43 +0000 (13:19 -0800)]
Added VIBRATE permission to allow haptic feedback.
Bug:
2244573
root [Mon, 28 Sep 2009 00:25:02 +0000 (02:25 +0200)]
fix issue 2934
Restoring old logic which was OK
Somebody changed logic in DTMFTwelveKeyDialer and TwelveKeyDialer but TwelveKeyDialer was correct
Jeff Sharkey [Wed, 4 Nov 2009 01:15:26 +0000 (17:15 -0800)]
am
cc31341a: am
e040876b: Avoid offering "share" for restricted-only contacts.
Merge commit '
cc31341abd08df772b7946a026d2ee8dfa5310db' into eclair-mr2-plus-aosp
* commit '
cc31341abd08df772b7946a026d2ee8dfa5310db':
Avoid offering "share" for restricted-only contacts.
Jeff Sharkey [Wed, 4 Nov 2009 01:06:09 +0000 (17:06 -0800)]
am
e040876b: Avoid offering "share" for restricted-only contacts.
Merge commit '
e040876b306dfc2e161f080f53e32dd96bc873bd' into eclair-mr2
* commit '
e040876b306dfc2e161f080f53e32dd96bc873bd':
Avoid offering "share" for restricted-only contacts.
Jeff Sharkey [Tue, 3 Nov 2009 20:57:16 +0000 (12:57 -0800)]
Avoid offering "share" for restricted-only contacts.
Fixes http://b/
2223256
Evan Millar [Tue, 3 Nov 2009 18:25:21 +0000 (10:25 -0800)]
am
07b7db66: Merge change I10483b6b into eclair-mr2
Merge commit '
07b7db663268bc6d6c6feb4de4a576f600597cd6' into eclair-mr2-plus-aosp
* commit '
07b7db663268bc6d6c6feb4de4a576f600597cd6':
Scale contact shortcut icons to correct size.
Android (Google) Code Review [Tue, 3 Nov 2009 18:14:18 +0000 (13:14 -0500)]
Merge change I10483b6b into eclair-mr2
* changes:
Scale contact shortcut icons to correct size.
Evan Millar [Tue, 3 Nov 2009 00:46:13 +0000 (16:46 -0800)]
Scale contact shortcut icons to correct size.
Fixes http://b/issue?id=
2163538
Nicolas Catania [Tue, 3 Nov 2009 16:03:22 +0000 (08:03 -0800)]
am
4e700d6f: Merge change Ie2d91013 into eclair-mr2
Merge commit '
4e700d6f2400a854d61a3f5fa5f3a60ff20632e4' into eclair-mr2-plus-aosp
* commit '
4e700d6f2400a854d61a3f5fa5f3a60ff20632e4':
Remove duplicate ButtonGridLayout class.
Android (Google) Code Review [Tue, 3 Nov 2009 15:56:06 +0000 (10:56 -0500)]
Merge change Ie2d91013 into eclair-mr2
* changes:
Remove duplicate ButtonGridLayout class.
Jeff Sharkey [Mon, 2 Nov 2009 23:53:51 +0000 (15:53 -0800)]
am
880fc658: am
93640fa2: Avoid NPE in isEmpty() when no EditFields defined.
Merge commit '
880fc65813ec11a85bf2d47933ec28d63999a5ab' into eclair-mr2-plus-aosp
* commit '
880fc65813ec11a85bf2d47933ec28d63999a5ab':
Avoid NPE in isEmpty() when no EditFields defined.
Jeff Sharkey [Mon, 2 Nov 2009 23:48:48 +0000 (15:48 -0800)]
am
93640fa2: Avoid NPE in isEmpty() when no EditFields defined.
Merge commit '
93640fa2b864d83ce15d22f349144972765647a3' into eclair-mr2
* commit '
93640fa2b864d83ce15d22f349144972765647a3':
Avoid NPE in isEmpty() when no EditFields defined.
Nicolas Catania [Mon, 2 Nov 2009 22:35:17 +0000 (14:35 -0800)]
Remove duplicate ButtonGridLayout class.
Uses the one from the shared phone static lib.
Jeff Sharkey [Fri, 30 Oct 2009 20:41:53 +0000 (13:41 -0700)]
Avoid NPE in isEmpty() when no EditFields defined.
Fixes http://b/
2226220
Jeff Sharkey [Fri, 30 Oct 2009 20:52:34 +0000 (13:52 -0700)]
am
dbeb965d: Avoid NPE in isEmpty() when no EditFields defined.
Merge commit '
dbeb965d19a3c03e78cd54d9fbe7337b4fbb06f2' into eclair-mr2-plus-aosp
* commit '
dbeb965d19a3c03e78cd54d9fbe7337b4fbb06f2':
Avoid NPE in isEmpty() when no EditFields defined.
Jeff Sharkey [Fri, 30 Oct 2009 20:41:53 +0000 (13:41 -0700)]
Avoid NPE in isEmpty() when no EditFields defined.
Fixes http://b/
2226220
Eric Fischer [Fri, 30 Oct 2009 18:23:45 +0000 (11:23 -0700)]
am
868e6967: am
05fc2e76: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
868e696785d0253eeec2ba042b1859559fc2861b' into eclair-mr2-plus-aosp
* commit '
868e696785d0253eeec2ba042b1859559fc2861b':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 18:18:01 +0000 (11:18 -0700)]
am
05fc2e76: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
05fc2e769b3bac38085a78ed7e2ab8a8d83d0932' into eclair-mr2
* commit '
05fc2e769b3bac38085a78ed7e2ab8a8d83d0932':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 17:04:58 +0000 (10:04 -0700)]
Import revised translations. DO NOT MERGE
Jeff Sharkey [Fri, 30 Oct 2009 02:46:08 +0000 (19:46 -0700)]
am
ecccd188: am
306f903f: Merge change I994fc479 into eclair
Merge commit '
ecccd188e5927e17cb5d4b4b0bf9c09e64275ac1' into eclair-mr2-plus-aosp
* commit '
ecccd188e5927e17cb5d4b4b0bf9c09e64275ac1':
Send RESULT_CANCELED when missing, return legacy Uris.
Jeff Sharkey [Fri, 30 Oct 2009 02:46:03 +0000 (19:46 -0700)]
am
ce6e5f52: am
5bd82f69: When reparenting, prefer GROUP_ROW_ID but allow fallback.
Merge commit '
ce6e5f529274665c50fc7339366a8b58749464f4' into eclair-mr2-plus-aosp
* commit '
ce6e5f529274665c50fc7339366a8b58749464f4':
When reparenting, prefer GROUP_ROW_ID but allow fallback.
Evan Millar [Fri, 30 Oct 2009 02:45:57 +0000 (19:45 -0700)]
am
64ef8f7b: am
7f9ca285: Fix bug b/issue?id=
2208177
Merge commit '
64ef8f7b226e01c5cf347e24fc97f0d75242e169' into eclair-mr2-plus-aosp
* commit '
64ef8f7b226e01c5cf347e24fc97f0d75242e169':
Fix bug http://b/issue?id=
2208177
Nicolas Catania [Fri, 30 Oct 2009 02:45:51 +0000 (19:45 -0700)]
am
be876105: am
b763c904: Merge change I2dc2bdef into eclair
Merge commit '
be876105998a7c8b94ccdb14b3b78dcd91dca02e' into eclair-mr2-plus-aosp
* commit '
be876105998a7c8b94ccdb14b3b78dcd91dca02e':
Final UI tweaks for the WGVA dialer.
Eric Fischer [Fri, 30 Oct 2009 02:45:45 +0000 (19:45 -0700)]
am
ce7bb8db: am
f664ce7f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
ce7bb8dbac5d33cb772209da33a2610c9dc01692' into eclair-mr2-plus-aosp
* commit '
ce7bb8dbac5d33cb772209da33a2610c9dc01692':
Import revised translations. DO NOT MERGE
Jeff Sharkey [Fri, 30 Oct 2009 02:34:37 +0000 (19:34 -0700)]
am
306f903f: Merge change I994fc479 into eclair
Merge commit '
306f903ffb9aa39bb3833fa052f24a37dfed2a4f' into eclair-mr2
* commit '
306f903ffb9aa39bb3833fa052f24a37dfed2a4f':
Send RESULT_CANCELED when missing, return legacy Uris.
Jeff Sharkey [Fri, 30 Oct 2009 02:34:32 +0000 (19:34 -0700)]
am
5bd82f69: When reparenting, prefer GROUP_ROW_ID but allow fallback.
Merge commit '
5bd82f693788c39c2b2225ac49b38cb8be5d1d18' into eclair-mr2
* commit '
5bd82f693788c39c2b2225ac49b38cb8be5d1d18':
When reparenting, prefer GROUP_ROW_ID but allow fallback.
Evan Millar [Fri, 30 Oct 2009 02:33:51 +0000 (19:33 -0700)]
am
7f9ca285: Fix bug http://b/issue?id=
2208177
Merge commit '
7f9ca2853d936ea0bdcf61cb7f9fb28c8669f681' into eclair-mr2
* commit '
7f9ca2853d936ea0bdcf61cb7f9fb28c8669f681':
Fix bug http://b/issue?id=
2208177
Nicolas Catania [Fri, 30 Oct 2009 02:27:37 +0000 (19:27 -0700)]
am
b763c904: Merge change I2dc2bdef into eclair
Merge commit '
b763c904ddab7b7435bfc27d0a574476d9328ff4' into eclair-mr2
* commit '
b763c904ddab7b7435bfc27d0a574476d9328ff4':
Final UI tweaks for the WGVA dialer.
Eric Fischer [Fri, 30 Oct 2009 02:23:09 +0000 (19:23 -0700)]
am
f664ce7f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
f664ce7f5c514c132b022548a4f446360e6e5d88' into eclair-mr2
* commit '
f664ce7f5c514c132b022548a4f446360e6e5d88':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Thu, 29 Oct 2009 23:59:17 +0000 (19:59 -0400)]
Merge change I994fc479 into eclair
* changes:
Send RESULT_CANCELED when missing, return legacy Uris.
Jeff Sharkey [Wed, 28 Oct 2009 00:22:53 +0000 (17:22 -0700)]
Send RESULT_CANCELED when missing, return legacy Uris.
When no contact was persisted (for example a save that has
been trimmed to a no-op) we return RESULT_CANCELED.
When an Intent like ACTION_INSERT requests a legacy Uri we
correctly return a legacy Uri instead of lookup-style.
Fixes http://b/
2219805 and http://b/
2219813
Daisuke Miyakawa [Thu, 29 Oct 2009 23:35:36 +0000 (16:35 -0700)]
am
2508e96e: Merge change I46befc3c into eclair-mr2
Merge commit '
2508e96e7dd380568022cac86c0411212cde40ab' into eclair-mr2-plus-aosp
* commit '
2508e96e7dd380568022cac86c0411212cde40ab':
Consolidate Contacts code.
Android (Google) Code Review [Thu, 29 Oct 2009 23:30:44 +0000 (19:30 -0400)]
Merge change I46befc3c into eclair-mr2
* changes:
Consolidate Contacts code.
Jeff Sharkey [Wed, 28 Oct 2009 21:20:42 +0000 (14:20 -0700)]
When reparenting, prefer GROUP_ROW_ID but allow fallback.
When a GROUP_SOURCE_ID is the only value provided, usually
while a sync is still going on, allow it to remain when a
valid ROW_ID is present. Fixes http://b/
2222283
Evan Millar [Thu, 29 Oct 2009 22:22:37 +0000 (15:22 -0700)]
Fix bug http://b/issue?id=
2208177
Use a subclass of ListView that explicitly requests focus after the
first time it is layed out.
Dmitri Plotnikov [Thu, 29 Oct 2009 21:57:10 +0000 (14:57 -0700)]
am
cf94b9e2: Fixing legacy contact picker.
Merge commit '
cf94b9e22c56085a241b26fe976547bef185f523' into eclair-mr2-plus-aosp
* commit '
cf94b9e22c56085a241b26fe976547bef185f523':
Fixing legacy contact picker.
Android (Google) Code Review [Thu, 29 Oct 2009 15:12:24 +0000 (11:12 -0400)]
Merge change I2dc2bdef into eclair
* changes:
Final UI tweaks for the WGVA dialer.
Eric Fischer [Thu, 29 Oct 2009 04:18:03 +0000 (21:18 -0700)]
Import revised translations. DO NOT MERGE
Nicolas Catania [Wed, 28 Oct 2009 22:11:39 +0000 (15:11 -0700)]
Final UI tweaks for the WGVA dialer.
Added a bit more space around the torpedo. (VM/dial/BS)
Tested with wvga800 and wvga850.
wvga800 match perfectly the designer's mocks.
wvga854 the torpedo is about 2px lower than it should but
it is best I can do to make the long layout work.
Bug:
2198341
Dmitri Plotnikov [Wed, 28 Oct 2009 21:47:07 +0000 (14:47 -0700)]
Fixing legacy contact picker.
Also removing photos from legacy pickers, where we cannot show photos anyway.
Bug: http://b/
2222348
Change-Id: Id199032254ac34747782a1d871f66a8b1adcae9f
Daisuke Miyakawa [Wed, 28 Oct 2009 01:13:57 +0000 (10:13 +0900)]
Consolidate Contacts code.
As per the issue
2217164, I roughly looked over how the variable "phoneNumber" is treaded in Eclair, and found the code around it looked a little flaky.
I believe this change does not make Contacts code easier to read, while there's no malicious regression.
Internal issue number:
2217164
Evan Millar [Mon, 26 Oct 2009 23:57:05 +0000 (16:57 -0700)]
am
951fa9c0: Make website item in Contact Card linked.
Merge commit '
951fa9c0c55ba87d18b92a77e4d1d8091b29d7c9' into eclair-mr2-plus-aosp
* commit '
951fa9c0c55ba87d18b92a77e4d1d8091b29d7c9':
Make website item in Contact Card linked.
Evan Millar [Mon, 26 Oct 2009 21:57:43 +0000 (14:57 -0700)]
Make website item in Contact Card linked.
David Brown [Thu, 22 Oct 2009 16:33:56 +0000 (09:33 -0700)]
am
f5c36736: am
e82beaea: Merge change I3d0980fd into eclair
Merge commit '
f5c36736fef18b739a24e33bb8d87de668299f0e' into eclair-mr2-plus-aosp
* commit '
f5c36736fef18b739a24e33bb8d87de668299f0e':
Fix hardcoded px dimensions in "dialpad chooser" UI.
Eric Fischer [Thu, 22 Oct 2009 16:33:52 +0000 (09:33 -0700)]
am
adc3e0a4: am
195dd154: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
adc3e0a47d35dbff4a4ba1884254d377ec931bfa' into eclair-mr2-plus-aosp
* commit '
adc3e0a47d35dbff4a4ba1884254d377ec931bfa':
Import revised translations. 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]
David Brown [Thu, 22 Oct 2009 13:47:51 +0000 (06:47 -0700)]
am
e82beaea: Merge change I3d0980fd into eclair
Merge commit '
e82beaeaee62c447ca0df4865f35ce4631ca0c54' into eclair-mr2
* commit '
e82beaeaee62c447ca0df4865f35ce4631ca0c54':
Fix hardcoded px dimensions in "dialpad chooser" UI.
Eric Fischer [Thu, 22 Oct 2009 13:45:16 +0000 (06:45 -0700)]
am
195dd154: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
195dd1543fc25230f7ca8f1b37c7d28a90e7879b' into eclair-mr2
* commit '
195dd1543fc25230f7ca8f1b37c7d28a90e7879b':
Import revised translations. 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: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 20:33:58 +0000 (16:33 -0400)]
Merge change I3d0980fd into eclair
* changes:
Fix hardcoded px dimensions in "dialpad chooser" UI.
Eric Fischer [Wed, 21 Oct 2009 17:43:57 +0000 (10:43 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
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
David Brown [Tue, 20 Oct 2009 19:09:17 +0000 (12:09 -0700)]
Fix hardcoded px dimensions in "dialpad chooser" UI.
In the "dialpad chooser" UI (which comes up if you launch the Dialer while
a call is already in progress) the 3 items are too tightly spaced on WVGA
devices. Fixed by changing the relevant dimensions from px to dp.
BUG=
2185527
TESTED: got into the "chooser" state on a WVGA phone, confirmed the items
are now sized correctly.
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.