OSDN Git Service
Makoto Onuki [Fri, 11 Dec 2009 00:08:24 +0000 (16:08 -0800)]
am
d6ccc719: Add websites to quick contact, and make sure the map icon and the website icon appear at the end of the list.
Merge commit '
d6ccc7195e8e27e716cce4fdcefdef7ac1775201' into eclair-mr2-plus-aosp
* commit '
d6ccc7195e8e27e716cce4fdcefdef7ac1775201':
Add websites to quick contact, and make sure the map icon and the website icon appear at the end of the list.
Makoto Onuki [Thu, 10 Dec 2009 19:54:45 +0000 (11:54 -0800)]
Add websites to quick contact, and make sure the map icon and the website icon appear at the end of the list.
Fixes b/
2272320.
Fred Quintana [Thu, 10 Dec 2009 00:00:23 +0000 (16:00 -0800)]
am
8579e25f: changed to use the new EntityIterator interface
Merge commit '
8579e25faeedbb1d00ee295da4c74e45bd782573' into eclair-mr2-plus-aosp
* commit '
8579e25faeedbb1d00ee295da4c74e45bd782573':
changed to use the new EntityIterator interface
Fred Quintana [Mon, 7 Dec 2009 22:50:12 +0000 (14:50 -0800)]
changed to use the new EntityIterator interface
Jeff Sharkey [Mon, 7 Dec 2009 21:30:15 +0000 (13:30 -0800)]
am
373f2c68: am
eb6f9c08: Merge change I0ad3fc43 into eclair
Merge commit '
373f2c68131fada39948ecc4c1dd9770b5d0e856' into eclair-mr2-plus-aosp
* commit '
373f2c68131fada39948ecc4c1dd9770b5d0e856':
Avoid IAE by only dismissing dialog when still attached.
Jeff Sharkey [Mon, 7 Dec 2009 21:27:26 +0000 (13:27 -0800)]
am
eb6f9c08: Merge change I0ad3fc43 into eclair
Merge commit '
eb6f9c0824ed739ad4fbfeef19ac1b54553a0914' into eclair-mr2
* commit '
eb6f9c0824ed739ad4fbfeef19ac1b54553a0914':
Avoid IAE by only dismissing dialog when still attached.
Android (Google) Code Review [Mon, 7 Dec 2009 21:25:02 +0000 (13:25 -0800)]
Merge change I0ad3fc43 into eclair
* changes:
Avoid IAE by only dismissing dialog when still attached.
Jeff Sharkey [Fri, 4 Dec 2009 00:40:53 +0000 (16:40 -0800)]
am
1a254304: am
1e576092: Merge change Ifb15e7fe into eclair
Merge commit '
1a25430478e57784ce2babe12c9b6d6fcaea32e2' into eclair-mr2-plus-aosp
* commit '
1a25430478e57784ce2babe12c9b6d6fcaea32e2':
Make call log requeries use background thread.
Romain Guy [Fri, 4 Dec 2009 00:37:44 +0000 (16:37 -0800)]
am
ae6b5883: am
26fbb58c: Add QuickContact badge around contacts shortcuts.
Merge commit '
ae6b5883b034be1cea0d616278ea9793886c32dd' into eclair-mr2-plus-aosp
* commit '
ae6b5883b034be1cea0d616278ea9793886c32dd':
Add QuickContact badge around contacts shortcuts.
Jeff Sharkey [Thu, 3 Dec 2009 22:06:38 +0000 (14:06 -0800)]
am
1e576092: Merge change Ifb15e7fe into eclair
Merge commit '
1e576092a606b1fc497138b0042cb376cbe9d486' into eclair-mr2
* commit '
1e576092a606b1fc497138b0042cb376cbe9d486':
Make call log requeries use background thread.
Android (Google) Code Review [Thu, 3 Dec 2009 22:00:44 +0000 (14:00 -0800)]
Merge change Ifb15e7fe into eclair
* changes:
Make call log requeries use background thread.
Romain Guy [Thu, 3 Dec 2009 20:21:25 +0000 (12:21 -0800)]
am
26fbb58c: Add QuickContact badge around contacts shortcuts.
Merge commit '
26fbb58c2d697a3c11e520ff237667e16ed8cf3b' into eclair-mr2
* commit '
26fbb58c2d697a3c11e520ff237667e16ed8cf3b':
Add QuickContact badge around contacts shortcuts.
Romain Guy [Thu, 3 Dec 2009 19:56:31 +0000 (11:56 -0800)]
Add QuickContact badge around contacts shortcuts.
Change-Id: I0757abbc118979917bc7d3ecb64103a9cdd4da00
Joe Onorato [Thu, 3 Dec 2009 06:42:27 +0000 (22:42 -0800)]
am
89d5b32c: am
75e84518: Make QuickContactActivity look at the sourceBounds property of Intent as well.
Merge commit '
89d5b32c6f5fe3ff5733b4a62c66dd2d6e590a65' into eclair-mr2-plus-aosp
* commit '
89d5b32c6f5fe3ff5733b4a62c66dd2d6e590a65':
Make QuickContactActivity look at the sourceBounds property of Intent as well.
Joe Onorato [Thu, 3 Dec 2009 06:38:45 +0000 (22:38 -0800)]
am
75e84518: Make QuickContactActivity look at the sourceBounds property of Intent as well.
Merge commit '
75e84518dd097e5fe8bacad5fa24aca0f1dedd43' into eclair-mr2
* commit '
75e84518dd097e5fe8bacad5fa24aca0f1dedd43':
Make QuickContactActivity look at the sourceBounds property of Intent as well.
Joe Onorato [Thu, 3 Dec 2009 04:17:19 +0000 (20:17 -0800)]
Make QuickContactActivity look at the sourceBounds property of Intent as well.
Romain Guy [Thu, 3 Dec 2009 04:29:52 +0000 (20:29 -0800)]
am
ee052b04: resolved conflicts for merge of
2bbeffbe to eclair-mr2
Merge commit '
ee052b0436476b7221859d090303ffec1d46d23b' into eclair-mr2-plus-aosp
* commit '
ee052b0436476b7221859d090303ffec1d46d23b':
Make Home contacts shortcut bring up the quick contact window.
Romain Guy [Thu, 3 Dec 2009 04:25:49 +0000 (20:25 -0800)]
resolved conflicts for merge of
2bbeffbe to eclair-mr2
Romain Guy [Thu, 3 Dec 2009 03:55:14 +0000 (19:55 -0800)]
Make Home contacts shortcut bring up the quick contact window.
Change-Id: I9cb20b9c7d77dc29a08019554f746089665403f5
Nicolas Catania [Wed, 2 Dec 2009 22:06:14 +0000 (14:06 -0800)]
am
2fc629bd: Merge change I905e7621 into eclair-mr2
Merge commit '
2fc629bd6ac5c27a5610553d3f54eadf20516224' into eclair-mr2-plus-aosp
* commit '
2fc629bd6ac5c27a5610553d3f54eadf20516224':
Dialpad uses the new HapticFeedback class.
Android (Google) Code Review [Wed, 2 Dec 2009 22:02:47 +0000 (14:02 -0800)]
Merge change I905e7621 into eclair-mr2
* changes:
Dialpad uses the new HapticFeedback class.
Daisuke Miyakawa [Wed, 2 Dec 2009 21:38:01 +0000 (13:38 -0800)]
am
c1d3e0e9: Merge change I2d66a983 into eclair-mr2
Merge commit '
c1d3e0e9139a47645aedfd9fe6704d7621f5ef12' into eclair-mr2-plus-aosp
* commit '
c1d3e0e9139a47645aedfd9fe6704d7621f5ef12':
Make Contacts app refresh cached EditFields when Locale is changed, and
Android (Google) Code Review [Wed, 2 Dec 2009 21:35:10 +0000 (13:35 -0800)]
Merge change I2d66a983 into eclair-mr2
* changes:
Make Contacts app refresh cached EditFields when Locale is changed, and change the display order of elements of StructuredName and StructuredPostal in accordance with the current locale.
Eric Fischer [Wed, 2 Dec 2009 01:28:44 +0000 (17:28 -0800)]
am
5cb25280: am
376bb3be: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
5cb252805c343e5de2ca67fc9a9b038e8d0f3c58' into eclair-mr2-plus-aosp
* commit '
5cb252805c343e5de2ca67fc9a9b038e8d0f3c58':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 01:06:23 +0000 (17:06 -0800)]
am
376bb3be: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
376bb3be9d0d7f377ac54fb7685972fb5c8925ce' into eclair-mr2
* commit '
376bb3be9d0d7f377ac54fb7685972fb5c8925ce':
Import revised translations. DO NOT MERGE
Neel Parekh [Wed, 2 Dec 2009 01:03:29 +0000 (17:03 -0800)]
am
96e7cee6: Merge change Ie6dfae04 into eclair-mr2
Merge commit '
96e7cee60fb87e9f7c14e7ee91febdbae1c31da8' into eclair-mr2-plus-aosp
* commit '
96e7cee60fb87e9f7c14e7ee91febdbae1c31da8':
Fix title for creating a new contact.
Jeff Sharkey [Tue, 1 Dec 2009 19:53:46 +0000 (11:53 -0800)]
Make call log requeries use background thread.
Fixes http://b/
2285268
Android (Google) Code Review [Tue, 1 Dec 2009 22:13:54 +0000 (14:13 -0800)]
Merge change Ie6dfae04 into eclair-mr2
* changes:
Fix title for creating a new contact.
Jeff Sharkey [Tue, 1 Dec 2009 21:56:40 +0000 (13:56 -0800)]
Avoid IAE by only dismissing dialog when still attached.
Fixes http://b/
2138584
Nicolas Catania [Tue, 1 Dec 2009 16:51:20 +0000 (08:51 -0800)]
Dialpad uses the new HapticFeedback class.
The new HapticFeedback class sits on top of the os vibrator
and honor the haptic feedback on-off system setting.
HapticFeedback is part of the static lib in Phone which
contains common code between Phone and Contacts.
Bug:
2261184
Eric Fischer [Mon, 30 Nov 2009 19:35:32 +0000 (11:35 -0800)]
Import revised translations. DO NOT MERGE
Daisuke Miyakawa [Tue, 24 Nov 2009 12:14:46 +0000 (21:14 +0900)]
Make Contacts app refresh cached EditFields when Locale is changed, and
change the display order of elements of StructuredName and StructuredPostal
in accordance with the current locale.
Especially in Japan, the way how to display name and postal addresses is
different from US's. For example, "Family Middle Given" is usual in Japan,
while "Given Middle Family" is usual in US and perhaps the other countries.
Internal issue number:
2275764
Makoto Onuki [Thu, 26 Nov 2009 01:12:34 +0000 (17:12 -0800)]
am
4cbb29a4: EditContactActivity: Save and restore the visibility of EditTexts/secondary section across Activity\'s lifecycle.
Merge commit '
4cbb29a41b5cfec61b6b785794878cce4c00b445' into eclair-mr2-plus-aosp
* commit '
4cbb29a41b5cfec61b6b785794878cce4c00b445':
EditContactActivity: Save and restore the visibility of EditTexts/secondary section across Activity's lifecycle.
Makoto Onuki [Thu, 12 Nov 2009 05:19:31 +0000 (14:19 +0900)]
EditContactActivity: Save and restore the visibility of EditTexts/secondary section across Activity's lifecycle.
Fixes b/
2198110.
Makoto Onuki [Fri, 20 Nov 2009 01:36:57 +0000 (17:36 -0800)]
am
7a70738a: ViewContactActivity: Don\'t show "No additional info..." while we\'re still loading data.
Merge commit '
7a70738a3cd3a2519f504ff35607eb543a06d134' into eclair-mr2-plus-aosp
* commit '
7a70738a3cd3a2519f504ff35607eb543a06d134':
ViewContactActivity: Don't show "No additional info..." while we're still loading data.
Neel Parekh [Fri, 20 Nov 2009 01:29:28 +0000 (17:29 -0800)]
Fix title for creating a new contact.
Bug:
2209363
Makoto Onuki [Thu, 19 Nov 2009 04:35:55 +0000 (13:35 +0900)]
ViewContactActivity: Don't show "No additional info..." while we're still loading data.
Fixes b/
2195805.
Jeff Sharkey [Thu, 19 Nov 2009 01:56:06 +0000 (17:56 -0800)]
am
16c364a5: Parse organization and notes from intent extras.
Merge commit '
16c364a557d619a0396ed35249478dcf2c1ffba5' into eclair-mr2-plus-aosp
* commit '
16c364a557d619a0396ed35249478dcf2c1ffba5':
Parse organization and notes from intent extras.
Neel Parekh [Thu, 19 Nov 2009 01:56:02 +0000 (17:56 -0800)]
am
b1590e17: Move IM to the "more" section.
Merge commit '
b1590e172e3d4e7bafb478926f4ff8834bef973d' into eclair-mr2-plus-aosp
* commit '
b1590e172e3d4e7bafb478926f4ff8834bef973d':
Move IM to the "more" section.
Jeff Sharkey [Thu, 12 Nov 2009 05:30:38 +0000 (21:30 -0800)]
Parse organization and notes from intent extras.
Fixes http://b/
2256272
Neel Parekh [Thu, 19 Nov 2009 01:40:31 +0000 (17:40 -0800)]
Move IM to the "more" section.
Bug:
2267141
Dan Egnor [Wed, 18 Nov 2009 04:31:33 +0000 (20:31 -0800)]
am
af953427: Merge change I7c66eb48 into eclair-mr2
Merge commit '
af953427e532ea03464f4d08f17ec9ebafb85834' into eclair-mr2-plus-aosp
* commit '
af953427e532ea03464f4d08f17ec9ebafb85834':
Remove an unused and inconvenient import statement.
Android (Google) Code Review [Wed, 18 Nov 2009 04:27:38 +0000 (20:27 -0800)]
Merge change I7c66eb48 into eclair-mr2
* changes:
Remove an unused and inconvenient import statement.
Dan Egnor [Wed, 18 Nov 2009 02:41:03 +0000 (18:41 -0800)]
Remove an unused and inconvenient import statement.
Daisuke Miyakawa [Tue, 17 Nov 2009 09:05:45 +0000 (01:05 -0800)]
am
de31a7a6: Make ImportVCardActivity.java adapt to refactored vCard code. Must be submitted after the change I11526e6c.
Merge commit '
de31a7a65820c8a8075797e66ab22a133f942b85' into eclair-mr2-plus-aosp
* commit '
de31a7a65820c8a8075797e66ab22a133f942b85':
Make ImportVCardActivity.java adapt to refactored vCard code.
Daisuke Miyakawa [Tue, 17 Nov 2009 08:14:04 +0000 (17:14 +0900)]
Make ImportVCardActivity.java adapt to refactored vCard code.
Must be submitted after the change I11526e6c.
Internal issue number:
2195990
Daisuke Miyakawa [Mon, 16 Nov 2009 22:35:54 +0000 (14:35 -0800)]
am
fec783e0: Rename class names. Must be applied with the change Iecf85b40.
Merge commit '
fec783e012a568e3b0a2c6e220b4bf742f89d983' into eclair-mr2-plus-aosp
* commit '
fec783e012a568e3b0a2c6e220b4bf742f89d983':
Rename class names. Must be applied with the change Iecf85b40.
Daisuke Miyakawa [Mon, 16 Nov 2009 07:32:10 +0000 (16:32 +0900)]
Rename class names. Must be applied with the change Iecf85b40.
Internal issue number:
2195990
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:24 +0000 (14:55 -0800)]
merge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:06:38 +0000 (14:06 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:06:46 +0000 (12:06 -0800)]
merge from eclair
Eric Fischer [Sat, 14 Nov 2009 01:52:17 +0000 (17:52 -0800)]
am
57fda7d9: am
cf634137: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
57fda7d9ead81a238c6050c55de90b96788c1edb' into eclair-mr2-plus-aosp
* commit '
57fda7d9ead81a238c6050c55de90b96788c1edb':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:48:47 +0000 (17:48 -0800)]
am
cf634137: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
cf6341370837150ba9992bbf4fdcd89ea996af31' into eclair-mr2
* commit '
cf6341370837150ba9992bbf4fdcd89ea996af31':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:47:47 +0000 (17:47 -0800)]
am
cf634137: Import revised translations. DO NOT MERGE
Merge commit '
cf6341370837150ba9992bbf4fdcd89ea996af31' into eclair-plus-aosp
* commit '
cf6341370837150ba9992bbf4fdcd89ea996af31':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:20:47 +0000 (17:20 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Eric Fischer [Fri, 13 Nov 2009 18:59:56 +0000 (10:59 -0800)]
am
0322b96a: am
a43b1c77: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
0322b96a21f2f174f1f65f6adcd3651332190563' into eclair-mr2-plus-aosp
* commit '
0322b96a21f2f174f1f65f6adcd3651332190563':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 18:39:41 +0000 (10:39 -0800)]
am
a43b1c77: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
a43b1c7740df90faf4b59f7447a3fde2e4c79710' into eclair-mr2
* commit '
a43b1c7740df90faf4b59f7447a3fde2e4c79710':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 18:38:12 +0000 (10:38 -0800)]
am
a43b1c77: Import revised translations. DO NOT MERGE
Merge commit '
a43b1c7740df90faf4b59f7447a3fde2e4c79710' into eclair-plus-aosp
* commit '
a43b1c7740df90faf4b59f7447a3fde2e4c79710':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 03:47:23 +0000 (19:47 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:46:09 +0000 (18:46 -0800)]
eclair snapshot
Brett Chabot [Thu, 12 Nov 2009 20:08:22 +0000 (12:08 -0800)]
am
d20fb0bb: am
0e89b19a: Add instrumentation definition for ContactsLaunchPerformance.
Merge commit '
d20fb0bb787acd677309d917eb99965182b6f332' into eclair-mr2-plus-aosp
* commit '
d20fb0bb787acd677309d917eb99965182b6f332':
Add instrumentation definition for ContactsLaunchPerformance.
Brett Chabot [Thu, 12 Nov 2009 20:04:16 +0000 (12:04 -0800)]
am
0e89b19a: Add instrumentation definition for ContactsLaunchPerformance.
Merge commit '
0e89b19a687651da3e400c0eca5ac8692c3d986b' into eclair-mr2
* commit '
0e89b19a687651da3e400c0eca5ac8692c3d986b':
Add instrumentation definition for ContactsLaunchPerformance.
Brett Chabot [Thu, 12 Nov 2009 20:04:04 +0000 (12:04 -0800)]
am
0e89b19a: Add instrumentation definition for ContactsLaunchPerformance.
Merge commit '
0e89b19a687651da3e400c0eca5ac8692c3d986b' into eclair-plus-aosp
* commit '
0e89b19a687651da3e400c0eca5ac8692c3d986b':
Add instrumentation definition for ContactsLaunchPerformance.
Brett Chabot [Thu, 12 Nov 2009 19:48:30 +0000 (11:48 -0800)]
Add instrumentation definition for ContactsLaunchPerformance.
Change-Id: I5f0d8ddf59184d8b80a18d46ba246d5437f4e0d2
Daisuke Miyakawa [Thu, 12 Nov 2009 01:20:55 +0000 (17:20 -0800)]
am
373da77b: am
56150748: Revert "Use scan mode introduced in VCardParser."
Merge commit '
373da77b6974f2cf3fb0c69c1225df55ef7d526d' into eclair-mr2-plus-aosp
* commit '
373da77b6974f2cf3fb0c69c1225df55ef7d526d':
Revert "Use scan mode introduced in VCardParser."
Daisuke Miyakawa [Thu, 12 Nov 2009 01:20:52 +0000 (17:20 -0800)]
am
0ce0a988: am
ee455d5c: Merge change I428a6432 into eclair
Merge commit '
0ce0a988ce7215f6149b900fe254c661793e2144' into eclair-mr2-plus-aosp
* commit '
0ce0a988ce7215f6149b900fe254c661793e2144':
Use scan mode introduced in VCardParser.
Jean-Michel Trivi [Thu, 12 Nov 2009 01:20:48 +0000 (17:20 -0800)]
am
1016604c: am
dd44f8c8: Fix bug
2239212 "Dial pad has no sound" The DTMF stream volume is tied to the in-call volume. In the dialer outside of a call, the user has no way to change the touch tone volume. If (s)he lowered the incall volume all the way down, the user
Merge commit '
1016604cc4989de5361aac75b05e861be1d24d5d' into eclair-mr2-plus-aosp
* commit '
1016604cc4989de5361aac75b05e861be1d24d5d':
Fix bug
2239212 "Dial pad has no sound"
Daisuke Miyakawa [Thu, 12 Nov 2009 01:11:02 +0000 (17:11 -0800)]
am
56150748: Revert "Use scan mode introduced in VCardParser."
Merge commit '
5615074876e324863accc8d68ebe567c0041bda5' into eclair-mr2
* commit '
5615074876e324863accc8d68ebe567c0041bda5':
Revert "Use scan mode introduced in VCardParser."
Daisuke Miyakawa [Thu, 12 Nov 2009 01:10:39 +0000 (17:10 -0800)]
am
ee455d5c: Merge change I428a6432 into eclair
Merge commit '
ee455d5cc87fcad55e52c3c720aaf341b2dd7114' into eclair-mr2
* commit '
ee455d5cc87fcad55e52c3c720aaf341b2dd7114':
Use scan mode introduced in VCardParser.
Jean-Michel Trivi [Thu, 12 Nov 2009 01:07:44 +0000 (17:07 -0800)]
am
dd44f8c8: Fix bug
2239212 "Dial pad has no sound" The DTMF stream volume is tied to the in-call volume. In the dialer outside of a call, the user has no way to change the touch tone volume. If (s)he lowered the incall volume all the way down, the user will usually
Merge commit '
dd44f8c8d1dac0cf137a160b6ba9f3ca42f65600' into eclair-mr2
* commit '
dd44f8c8d1dac0cf137a160b6ba9f3ca42f65600':
Fix bug
2239212 "Dial pad has no sound"
Daisuke Miyakawa [Wed, 11 Nov 2009 07:50:05 +0000 (23:50 -0800)]
am
56150748: Revert "Use scan mode introduced in VCardParser."
Merge commit '
5615074876e324863accc8d68ebe567c0041bda5' into eclair-plus-aosp
* commit '
5615074876e324863accc8d68ebe567c0041bda5':
Revert "Use scan mode introduced in VCardParser."
Daisuke Miyakawa [Wed, 11 Nov 2009 07:42:49 +0000 (16:42 +0900)]
Revert "Use scan mode introduced in VCardParser."
This reverts commit
51f6f77ef0fb1e16be9d19009252ced701e19f75.
Found that the change above is NOT related to the issue
2245363 and break the build.
Dr.NO: Hiroshi
Internal issue number:
2245363
Daisuke Miyakawa [Wed, 11 Nov 2009 07:07:54 +0000 (23:07 -0800)]
am
ee455d5c: Merge change I428a6432 into eclair
Merge commit '
ee455d5cc87fcad55e52c3c720aaf341b2dd7114' into eclair-plus-aosp
* commit '
ee455d5cc87fcad55e52c3c720aaf341b2dd7114':
Use scan mode introduced in VCardParser.
Android (Google) Code Review [Wed, 11 Nov 2009 07:03:01 +0000 (23:03 -0800)]
Merge change I428a6432 into eclair
* changes:
Use scan mode introduced in VCardParser.
Jean-Michel Trivi [Wed, 11 Nov 2009 01:17:04 +0000 (17:17 -0800)]
am
dd44f8c8: Fix bug
2239212 "Dial pad has no sound" The DTMF stream volume is tied to the in-call volume. In the dialer outside of a call, the user has no way to change the touch tone volume. If (s)he lowered the incall volume all the way down, the user will usually
Merge commit '
dd44f8c8d1dac0cf137a160b6ba9f3ca42f65600' into eclair-plus-aosp
* commit '
dd44f8c8d1dac0cf137a160b6ba9f3ca42f65600':
Fix bug
2239212 "Dial pad has no sound"
Daisuke Miyakawa [Tue, 10 Nov 2009 22:16:18 +0000 (07:16 +0900)]
Use scan mode introduced in VCardParser.
This change must be merged after the change I5d30aa18 being submitted.
Internal issue number:
2245363
Dr.NO: Hiroshi
Daisuke Miyakawa [Wed, 11 Nov 2009 00:03:26 +0000 (16:03 -0800)]
am
eb175d68: Merge change I07725a2b into eclair-mr2
Merge commit '
eb175d688ad9e25f1ef126e838f86c96a14e6b02' into eclair-mr2-plus-aosp
* commit '
eb175d688ad9e25f1ef126e838f86c96a14e6b02':
Fix vCard exporter so that it does not throw NPE during export (though the exception is rarely seen).
Android (Google) Code Review [Tue, 10 Nov 2009 23:59:58 +0000 (15:59 -0800)]
Merge change I07725a2b into eclair-mr2
* changes:
Fix vCard exporter so that it does not throw NPE during export (though the exception is rarely seen).
Daisuke Miyakawa [Tue, 10 Nov 2009 23:56:34 +0000 (08:56 +0900)]
Fix vCard exporter so that it does not throw NPE during export (though the exception is rarely seen).
This issue is similar to what I saw in ImportVCardActivity, in which Thread starts before the
dialog is created. By changing the order of method calls, this change should be fixed.
Internal issue number:
2251391
Daisuke Miyakawa [Tue, 10 Nov 2009 22:19:41 +0000 (14:19 -0800)]
am
e40bdce6: Use scan mode introduced in VCardParser.
Merge commit '
e40bdce6169488d8701db0b1878ae400730aa370' into eclair-mr2-plus-aosp
* commit '
e40bdce6169488d8701db0b1878ae400730aa370':
Use scan mode introduced in VCardParser.
Daisuke Miyakawa [Tue, 10 Nov 2009 22:16:18 +0000 (07:16 +0900)]
Use scan mode introduced in VCardParser.
Internal issue number:
2245363
Jean-Michel Trivi [Tue, 10 Nov 2009 21:00:45 +0000 (13:00 -0800)]
Fix bug
2239212 "Dial pad has no sound"
The DTMF stream volume is tied to the in-call volume. In the dialer
outside of a call, the user has no way to change the touch tone
volume. If (s)he lowered the incall volume all the way down,
the user will usually complain that the dial pad has no sound,
and if they maxed it out, they'll complain it's too loud.
This change causes the tones to use the media volume, outside of
a call only, and to change the media volume when the user presses
the hardware volume keys.
This gives us both the advantage of keeping the incall behavior consistent
with the existing behavior (AFAIK there are no complaints regarding
in call DTMF volume), but offers the user control over the volume
in the dialer before/after a call.
Makoto Onuki [Tue, 10 Nov 2009 02:52:31 +0000 (18:52 -0800)]
am
4455e5a1: Merge change I8693b0d9 into eclair-mr2
Merge commit '
4455e5a166fca6e1b5acd19979515fdef810e83e' into eclair-mr2-plus-aosp
* commit '
4455e5a166fca6e1b5acd19979515fdef810e83e':
EditContactActivity: Restore focus when the screen rotates.
Android (Google) Code Review [Tue, 10 Nov 2009 02:50:32 +0000 (18:50 -0800)]
Merge change I8693b0d9 into eclair-mr2
* changes:
EditContactActivity: Restore focus when the screen rotates.
Jean-Baptiste Queru [Mon, 9 Nov 2009 17:42:08 +0000 (09:42 -0800)]
merge from open-source master
Jean-Baptiste Queru [Mon, 9 Nov 2009 00:01:40 +0000 (16:01 -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 22:03:11 +0000 (14:03 -0800)]
am
9bcf470c: Added VIBRATE permission to allow haptic feedback.
Merge commit '
9bcf470c6ed7210887a0442f7e25ca050e6375d6' into eclair-plus-aosp
* 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
Makoto Onuki [Mon, 2 Nov 2009 07:44:18 +0000 (16:44 +0900)]
EditContactActivity: Restore focus when the screen rotates.
Assign unique but consistent IDs to the EditText on EditContactActivity, so that focus is restored when we recreate the activity.
Also assign IDs to other views, such as GenericEditorView as well. This will be used to restore views' visibility.
This fixes b/
2151340.
Also, set focus at the new EditText when you add a new field by clicking on the "+" button.
This fixes b/
2223543.
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 [Wed, 4 Nov 2009 00:54:37 +0000 (16:54 -0800)]
am
e040876b: Avoid offering "share" for restricted-only contacts.
Merge commit '
e040876b306dfc2e161f080f53e32dd96bc873bd' into eclair-plus-aosp
* 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.