OSDN Git Service
Jean-Baptiste Queru [Sun, 15 Nov 2009 23:08:24 +0000 (15:08 -0800)]
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:26 +0000 (14:55 -0800)]
merge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:06:44 +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:54 +0000 (12:06 -0800)]
merge from eclair
Eric Fischer [Sat, 14 Nov 2009 02:04:05 +0000 (18:04 -0800)]
am
ac54a6fd: (-s ours) am
7cd65f3d: am
83e718f9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
ac54a6fd6c26871e770bce62bb1efd7a37001984'
* commit '
ac54a6fd6c26871e770bce62bb1efd7a37001984':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 02:00:11 +0000 (18:00 -0800)]
am
7cd65f3d: am
83e718f9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
7cd65f3dace45576823d9cb0600a1b1286d9af91' into eclair-mr2-plus-aosp
* commit '
7cd65f3dace45576823d9cb0600a1b1286d9af91':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:55:46 +0000 (17:55 -0800)]
am
83e718f9: Import revised translations. DO NOT MERGE
Merge commit '
83e718f92710c766ef341fdde769b2efc489bef9' into eclair-plus-aosp
* commit '
83e718f92710c766ef341fdde769b2efc489bef9':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:55:36 +0000 (17:55 -0800)]
am
83e718f9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
83e718f92710c766ef341fdde769b2efc489bef9' into eclair-mr2
* commit '
83e718f92710c766ef341fdde769b2efc489bef9':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:24:10 +0000 (17:24 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Eric Fischer [Fri, 13 Nov 2009 19:33:06 +0000 (11:33 -0800)]
am
c8fe4e8e: (-s ours) am
92b93495: am
48c451b3: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
c8fe4e8ee3646d8320886e62e254b0d2822f70d6'
* commit '
c8fe4e8ee3646d8320886e62e254b0d2822f70d6':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 19:10:31 +0000 (11:10 -0800)]
am
92b93495: am
48c451b3: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
92b93495c01e950e04275113c8936dbdb0d38f56' into eclair-mr2-plus-aosp
* commit '
92b93495c01e950e04275113c8936dbdb0d38f56':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 18:42:40 +0000 (10:42 -0800)]
am
48c451b3: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
48c451b38824e96b85ab9f5bac8724b07bd2c9e5' into eclair-mr2
* commit '
48c451b38824e96b85ab9f5bac8724b07bd2c9e5':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 18:40:48 +0000 (10:40 -0800)]
am
48c451b3: Import revised translations. DO NOT MERGE
Merge commit '
48c451b38824e96b85ab9f5bac8724b07bd2c9e5' into eclair-plus-aosp
* commit '
48c451b38824e96b85ab9f5bac8724b07bd2c9e5':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 03:50:45 +0000 (19:50 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:46:12 +0000 (18:46 -0800)]
eclair snapshot
Amith Yamasani [Thu, 12 Nov 2009 03:26:26 +0000 (19:26 -0800)]
Jason Chen [Thu, 12 Nov 2009 03:26:22 +0000 (19:26 -0800)]
am
e40d8434: am
554cd5ec: am
6b23b270: Fix misspellings in the Settings app.
Merge commit '
e40d84343c61d1c5359e1d222ec38af850991ae2'
* commit '
e40d84343c61d1c5359e1d222ec38af850991ae2':
Fix misspellings in the Settings app.
Amith Yamasani [Thu, 12 Nov 2009 03:22:21 +0000 (19:22 -0800)]
am
eba00ec7: am
a79239b1: Merge change I2d844842 into eclair
Merge commit '
eba00ec701f9633a05203116151e94449e55c517' into eclair-mr2-plus-aosp
* commit '
eba00ec701f9633a05203116151e94449e55c517':
Fix for NPE in #
2248683
Jason Chen [Thu, 12 Nov 2009 03:22:18 +0000 (19:22 -0800)]
am
554cd5ec: am
6b23b270: Fix misspellings in the Settings app.
Merge commit '
554cd5eca37a1027bcd3d7cc024471ff1d0b9ac1' into eclair-mr2-plus-aosp
* commit '
554cd5eca37a1027bcd3d7cc024471ff1d0b9ac1':
Fix misspellings in the Settings app.
Amith Yamasani [Thu, 12 Nov 2009 03:20:33 +0000 (19:20 -0800)]
am
a79239b1: Merge change I2d844842 into eclair
Merge commit '
a79239b102f7b9c83e31be7b3a47ab50459b6a4f' into eclair-mr2
* commit '
a79239b102f7b9c83e31be7b3a47ab50459b6a4f':
Fix for NPE in #
2248683
Jason Chen [Thu, 12 Nov 2009 03:20:30 +0000 (19:20 -0800)]
am
6b23b270: Fix misspellings in the Settings app.
Merge commit '
6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c' into eclair-mr2
* commit '
6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c':
Fix misspellings in the Settings app.
Amith Yamasani [Thu, 12 Nov 2009 03:20:22 +0000 (19:20 -0800)]
am
a79239b1: Merge change I2d844842 into eclair
Merge commit '
a79239b102f7b9c83e31be7b3a47ab50459b6a4f' into eclair-plus-aosp
* commit '
a79239b102f7b9c83e31be7b3a47ab50459b6a4f':
Fix for NPE in #
2248683
Jason Chen [Thu, 12 Nov 2009 03:20:18 +0000 (19:20 -0800)]
am
6b23b270: Fix misspellings in the Settings app.
Merge commit '
6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c' into eclair-plus-aosp
* commit '
6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c':
Fix misspellings in the Settings app.
Android (Google) Code Review [Thu, 12 Nov 2009 03:15:47 +0000 (19:15 -0800)]
Merge change I2d844842 into eclair
* changes:
Fix for NPE in #
2248683
Amith Yamasani [Wed, 11 Nov 2009 23:22:37 +0000 (15:22 -0800)]
Fix for NPE in #
2248683
Also fix a problem in type-to-filter. It was looking for substring match
instead of searching on word boundaries. It will now search by word
boundaries (separated by space).
Jason Chen [Wed, 11 Nov 2009 16:39:31 +0000 (08:39 -0800)]
Fix misspellings in the Settings app.
Bug:
2176816
Michael Chan [Tue, 10 Nov 2009 23:23:13 +0000 (15:23 -0800)]
am
28a30ec4: am
4fcf94c4: am
5469ff8b: b/
2226832 Showing Pairing Dialog in the foreground
Merge commit '
28a30ec4929dbd753f98d42e061fa19386fabda3'
* commit '
28a30ec4929dbd753f98d42e061fa19386fabda3':
b/
2226832 Showing Pairing Dialog in the foreground
Daniel Sandler [Tue, 10 Nov 2009 23:23:10 +0000 (15:23 -0800)]
am
85c5b614: (-s ours) am
c3ace180: am
7ceb387e: (-s ours) Merge change Ib720a080 into eclair
Merge commit '
85c5b614d7bcd6f1d45102c11640292cce3d6690'
* commit '
85c5b614d7bcd6f1d45102c11640292cce3d6690':
Updated icons for Settings. DO NOT MERGE
Michael Chan [Tue, 10 Nov 2009 23:10:43 +0000 (15:10 -0800)]
am
4fcf94c4: am
5469ff8b: b/
2226832 Showing Pairing Dialog in the foreground
Merge commit '
4fcf94c47b5526e1ee64854d7e25bfcac171885b' into eclair-mr2-plus-aosp
* commit '
4fcf94c47b5526e1ee64854d7e25bfcac171885b':
b/
2226832 Showing Pairing Dialog in the foreground
Daniel Sandler [Tue, 10 Nov 2009 23:10:35 +0000 (15:10 -0800)]
am
c3ace180: am
7ceb387e: (-s ours) Merge change Ib720a080 into eclair
Merge commit '
c3ace180d0853185da19b49e9668324faa9f468e' into eclair-mr2-plus-aosp
* commit '
c3ace180d0853185da19b49e9668324faa9f468e':
Updated icons for Settings. DO NOT MERGE
Michael Chan [Tue, 10 Nov 2009 19:06:36 +0000 (11:06 -0800)]
am
5469ff8b: b/
2226832 Showing Pairing Dialog in the foreground
Merge commit '
5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-mr2
* commit '
5469ff8b3f9966c6f141078b37da5f178b7825e4':
b/
2226832 Showing Pairing Dialog in the foreground
Daniel Sandler [Tue, 10 Nov 2009 19:06:27 +0000 (11:06 -0800)]
am
7ceb387e: (-s ours) Merge change Ib720a080 into eclair
Merge commit '
7ceb387ee601655ba72264646e3d8ecf2d74c138' into eclair-mr2
* commit '
7ceb387ee601655ba72264646e3d8ecf2d74c138':
Updated icons for Settings. DO NOT MERGE
Michael Chan [Tue, 10 Nov 2009 19:06:01 +0000 (11:06 -0800)]
am
5469ff8b: b/
2226832 Showing Pairing Dialog in the foreground
Merge commit '
5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-plus-aosp
* commit '
5469ff8b3f9966c6f141078b37da5f178b7825e4':
b/
2226832 Showing Pairing Dialog in the foreground
Daniel Sandler [Tue, 10 Nov 2009 19:05:58 +0000 (11:05 -0800)]
am
7ceb387e: Merge change Ib720a080 into eclair
Merge commit '
7ceb387ee601655ba72264646e3d8ecf2d74c138' into eclair-plus-aosp
* commit '
7ceb387ee601655ba72264646e3d8ecf2d74c138':
Updated icons for Settings. DO NOT MERGE
Michael Chan [Mon, 9 Nov 2009 06:53:32 +0000 (22:53 -0800)]
b/
2226832 Showing Pairing Dialog in the foreground
Pairing Dialogs notifications (in the window shade) were not visible in full
screen apps e.g. gallery. Showing Pairing Dialog in the foreground:
1) if the remote device was picked in the device picker in the last minute or
2) if the device was in discoverable mode in the last minute.
Eric Fischer [Sat, 7 Nov 2009 00:27:31 +0000 (16:27 -0800)]
am
ac783645: (-s ours) am
60037611: Import revised translations. DO NOT MERGE
Merge commit '
ac7836457a8360154caf43d4be94ea464fc81966'
* commit '
ac7836457a8360154caf43d4be94ea464fc81966':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 7 Nov 2009 00:15:55 +0000 (16:15 -0800)]
am
60037611: Import revised translations. DO NOT MERGE
Merge commit '
60037611a4f4bd9f2a724f9076abb17f553c6bb9' into eclair-mr2-plus-aosp
* commit '
60037611a4f4bd9f2a724f9076abb17f553c6bb9':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 6 Nov 2009 23:29:45 +0000 (15:29 -0800)]
Import revised translations. DO NOT MERGE
Michael Chan [Fri, 6 Nov 2009 21:47:05 +0000 (13:47 -0800)]
am
d7962545: am
51dfd4b0: am
834e5993: b/
2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '
d7962545aadb31b5ac1a9ff93f5a91168bcae5c6'
* commit '
d7962545aadb31b5ac1a9ff93f5a91168bcae5c6':
b/
2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Android (Google) Code Review [Fri, 6 Nov 2009 21:44:30 +0000 (16:44 -0500)]
Merge change Ib720a080 into eclair
* changes:
Updated icons for Settings. DO NOT MERGE
Michael Chan [Fri, 6 Nov 2009 21:38:15 +0000 (13:38 -0800)]
am
51dfd4b0: am
834e5993: b/
2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '
51dfd4b03563fd5b6fa87a7123d8bf0a9a7ce89d' into eclair-mr2-plus-aosp
* commit '
51dfd4b03563fd5b6fa87a7123d8bf0a9a7ce89d':
b/
2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Michael Chan [Fri, 6 Nov 2009 21:32:53 +0000 (13:32 -0800)]
am
834e5993: b/
2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '
834e5993e4f2f34d5aceb3196601b30231d00b07' into eclair-mr2
* commit '
834e5993e4f2f34d5aceb3196601b30231d00b07':
b/
2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Michael Chan [Fri, 6 Nov 2009 21:32:42 +0000 (13:32 -0800)]
am
834e5993: b/
2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '
834e5993e4f2f34d5aceb3196601b30231d00b07' into eclair-plus-aosp
* commit '
834e5993e4f2f34d5aceb3196601b30231d00b07':
b/
2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Michael Chan [Fri, 6 Nov 2009 02:25:55 +0000 (18:25 -0800)]
b/
2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Also added test app.
Daniel Sandler [Tue, 3 Nov 2009 19:09:48 +0000 (14:09 -0500)]
Updated icons for Settings. DO NOT MERGE
Fixes http://b/
2105756
DrNo for eclair: mcleron
Change-Id: Ib720a080613a4513bd7bd62ae416c243ef9841a7
Daniel Sandler [Fri, 6 Nov 2009 00:45:01 +0000 (16:45 -0800)]
am
3f20d278: am
a21a458b: Merge change I3abd5c0d into eclair-mr2
Merge commit '
3f20d2782ffd00d46ce9a2c017e02d0cde72429c'
* commit '
3f20d2782ffd00d46ce9a2c017e02d0cde72429c':
Updated icons for Settings.
Michael Chan [Fri, 6 Nov 2009 00:44:55 +0000 (16:44 -0800)]
am
f69e5ad5: am
d55c31ea: am
4d004e91: b/
2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '
f69e5ad5372fbeef76f191f22e6d65202f9c782f'
* commit '
f69e5ad5372fbeef76f191f22e6d65202f9c782f':
b/
2238546 Fixed NPE in Settings when Bluetooth "class" is null
Daniel Sandler [Fri, 6 Nov 2009 00:39:43 +0000 (16:39 -0800)]
am
a21a458b: Merge change I3abd5c0d into eclair-mr2
Merge commit '
a21a458bf3ae8a7e6490221a5130b3d79818cb7b' into eclair-mr2-plus-aosp
* commit '
a21a458bf3ae8a7e6490221a5130b3d79818cb7b':
Updated icons for Settings.
Michael Chan [Fri, 6 Nov 2009 00:39:37 +0000 (16:39 -0800)]
am
d55c31ea: am
4d004e91: b/
2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '
d55c31ead6e52b215f42f351761483386ecacbc2' into eclair-mr2-plus-aosp
* commit '
d55c31ead6e52b215f42f351761483386ecacbc2':
b/
2238546 Fixed NPE in Settings when Bluetooth "class" is null
Android (Google) Code Review [Fri, 6 Nov 2009 00:33:14 +0000 (19:33 -0500)]
Merge change I3abd5c0d into eclair-mr2
* changes:
Updated icons for Settings.
Michael Chan [Thu, 5 Nov 2009 18:32:57 +0000 (10:32 -0800)]
am
4d004e91: b/
2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '
4d004e910732565ddd449c7c525f7d6cbd353392' into eclair-mr2
* commit '
4d004e910732565ddd449c7c525f7d6cbd353392':
b/
2238546 Fixed NPE in Settings when Bluetooth "class" is null
Michael Chan [Thu, 5 Nov 2009 18:32:02 +0000 (10:32 -0800)]
am
4d004e91: b/
2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '
4d004e910732565ddd449c7c525f7d6cbd353392' into eclair-plus-aosp
* commit '
4d004e910732565ddd449c7c525f7d6cbd353392':
b/
2238546 Fixed NPE in Settings when Bluetooth "class" is null
Michael Chan [Thu, 5 Nov 2009 01:19:48 +0000 (17:19 -0800)]
b/
2238546 Fixed NPE in Settings when Bluetooth "class" is null
Daniel Sandler [Tue, 3 Nov 2009 19:09:48 +0000 (14:09 -0500)]
Updated icons for Settings.
Fixes http://b/
2105756
Jean-Michel Trivi [Mon, 2 Nov 2009 19:02:14 +0000 (11:02 -0800)]
am
35a4c327: am
dd1f7c9e: am
9d6be2ba: Add backup string for a platform setting to enable or disable advanced audio recording features on QSD8k phones.
Merge commit '
35a4c327a94272d7bd1ec5c575e787ea3d5364cc'
* commit '
35a4c327a94272d7bd1ec5c575e787ea3d5364cc':
Add backup string for a platform setting to enable or disable
Jean-Michel Trivi [Mon, 2 Nov 2009 18:57:08 +0000 (10:57 -0800)]
am
dd1f7c9e: am
9d6be2ba: Add backup string for a platform setting to enable or disable advanced audio recording features on QSD8k phones.
Merge commit '
dd1f7c9e64b9614f5fe3fff9edf4343ee82ab48b' into eclair-mr2-plus-aosp
* commit '
dd1f7c9e64b9614f5fe3fff9edf4343ee82ab48b':
Add backup string for a platform setting to enable or disable
Jean-Michel Trivi [Mon, 2 Nov 2009 18:52:23 +0000 (10:52 -0800)]
am
9d6be2ba: Add backup string for a platform setting to enable or disable advanced audio recording features on QSD8k phones.
Merge commit '
9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-plus-aosp
* commit '
9d6be2baf517462d2cce818c21b25958a40e4f06':
Add backup string for a platform setting to enable or disable
Jean-Michel Trivi [Mon, 2 Nov 2009 18:52:15 +0000 (10:52 -0800)]
am
9d6be2ba: Add backup string for a platform setting to enable or disable advanced audio recording features on QSD8k phones.
Merge commit '
9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-mr2
* commit '
9d6be2baf517462d2cce818c21b25958a40e4f06':
Add backup string for a platform setting to enable or disable
Jean-Michel Trivi [Fri, 30 Oct 2009 23:03:47 +0000 (16:03 -0700)]
Add backup string for a platform setting to enable or disable
advanced audio recording features on QSD8k phones.
Eric Fischer [Mon, 2 Nov 2009 05:51:36 +0000 (21:51 -0800)]
am
bf777ba8: (-s ours) am
2b42f028: am
8e3c8c20: (-s ours) Merge change I1d016ce3 into eclair
Merge commit '
bf777ba89ccce0f6804a3a58daff1bbc767f7071'
* commit '
bf777ba89ccce0f6804a3a58daff1bbc767f7071':
Import revised translations. DO NOT MERGE
Mike Lockwood [Mon, 2 Nov 2009 05:51:31 +0000 (21:51 -0800)]
am
da2644a3: am
afe722ff: am
fd07eb22: Merge change Ibe1d06fc into eclair
Merge commit '
da2644a3aeaa163b21e5cfadd02aec4e40c0b31a'
* commit '
da2644a3aeaa163b21e5cfadd02aec4e40c0b31a':
Avoid setting screen brightness when initializing brightness dialog in automatic mode.
Eric Fischer [Fri, 30 Oct 2009 18:23:57 +0000 (11:23 -0700)]
am
2b42f028: am
8e3c8c20: (-s ours) Merge change I1d016ce3 into eclair
Merge commit '
2b42f028f7250f86590a8c39f2ce29936f960b7a' into eclair-mr2-plus-aosp
* commit '
2b42f028f7250f86590a8c39f2ce29936f960b7a':
Import revised translations. DO NOT MERGE
Mike Lockwood [Fri, 30 Oct 2009 18:23:52 +0000 (11:23 -0700)]
am
afe722ff: am
fd07eb22: Merge change Ibe1d06fc into eclair
Merge commit '
afe722ff83c8669e6cd678f949adf9df97f0e376' into eclair-mr2-plus-aosp
* commit '
afe722ff83c8669e6cd678f949adf9df97f0e376':
Avoid setting screen brightness when initializing brightness dialog in automatic mode.
Eric Fischer [Fri, 30 Oct 2009 18:18:07 +0000 (11:18 -0700)]
am
8e3c8c20: (-s ours) Merge change I1d016ce3 into eclair
Merge commit '
8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-mr2
* commit '
8e3c8c209b1f13d1704669887edb47df0a1afc0a':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 18:17:48 +0000 (11:17 -0700)]
am
8e3c8c20: Merge change I1d016ce3 into eclair
Merge commit '
8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-plus-aosp
* commit '
8e3c8c209b1f13d1704669887edb47df0a1afc0a':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Fri, 30 Oct 2009 18:09:06 +0000 (14:09 -0400)]
Merge change I1d016ce3 into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 17:05:54 +0000 (10:05 -0700)]
Import revised translations. DO NOT MERGE
Mike Lockwood [Fri, 30 Oct 2009 17:02:57 +0000 (10:02 -0700)]
am
fd07eb22: Merge change Ibe1d06fc into eclair
Merge commit '
fd07eb222b6bd32039cdc2545fb75552835e418f' into eclair-mr2
* commit '
fd07eb222b6bd32039cdc2545fb75552835e418f':
Avoid setting screen brightness when initializing brightness dialog in automatic mode.
Mike Lockwood [Fri, 30 Oct 2009 17:00:39 +0000 (10:00 -0700)]
am
fd07eb22: Merge change Ibe1d06fc into eclair
Merge commit '
fd07eb222b6bd32039cdc2545fb75552835e418f' into eclair-plus-aosp
* commit '
fd07eb222b6bd32039cdc2545fb75552835e418f':
Avoid setting screen brightness when initializing brightness dialog in automatic mode.
Android (Google) Code Review [Fri, 30 Oct 2009 16:56:20 +0000 (12:56 -0400)]
Merge change Ibe1d06fc into eclair
* changes:
Avoid setting screen brightness when initializing brightness dialog in automatic mode.
Mike Lockwood [Fri, 30 Oct 2009 07:08:03 +0000 (03:08 -0400)]
Avoid setting screen brightness when initializing brightness dialog in automatic mode.
Fixes bug b/
2226257 (Brightness wonky)
Change-Id: Ibe1d06fc907960dcb6a70faa92e6c3a562016865
Signed-off-by: Mike Lockwood <lockwood@android.com>
Michael Chan [Fri, 30 Oct 2009 03:14:34 +0000 (20:14 -0700)]
am
69b4dec0: am
8b643d94: am
0cb3743e: b/
2219381 Gray out Bluetooth Settings for the emulator
Merge commit '
69b4dec040eaf5f4984aa0128c75328e0b1b5efc'
* commit '
69b4dec040eaf5f4984aa0128c75328e0b1b5efc':
b/
2219381 Gray out Bluetooth Settings for the emulator
Amith Yamasani [Fri, 30 Oct 2009 03:14:28 +0000 (20:14 -0700)]
am
8c591405: am
a8a974bd: am
dd45a47b: Merge change I4d31288f into eclair
Merge commit '
8c591405074da2b1f8c5e51ef23b5507fb83fc98'
* commit '
8c591405074da2b1f8c5e51ef23b5507fb83fc98':
Fix for
1974140. Delete entry if not valid on hitting home.
Eric Fischer [Fri, 30 Oct 2009 03:14:22 +0000 (20:14 -0700)]
am
18828fa6: (-s ours) am
7bb19a89: am
17fcd476: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
18828fa65dfac58a8a0f7d3798c7c35f64d1ea20'
* commit '
18828fa65dfac58a8a0f7d3798c7c35f64d1ea20':
Import revised translations. DO NOT MERGE
Michael Chan [Fri, 30 Oct 2009 02:54:58 +0000 (19:54 -0700)]
am
8b643d94: am
0cb3743e: b/
2219381 Gray out Bluetooth Settings for the emulator
Merge commit '
8b643d946222119cf15b0d5d9d9cf7cd4fe019c1' into eclair-mr2-plus-aosp
* commit '
8b643d946222119cf15b0d5d9d9cf7cd4fe019c1':
b/
2219381 Gray out Bluetooth Settings for the emulator
Amith Yamasani [Fri, 30 Oct 2009 02:54:53 +0000 (19:54 -0700)]
am
a8a974bd: am
dd45a47b: Merge change I4d31288f into eclair
Merge commit '
a8a974bd171ccbc3b35b18c3e73a23d22834d05e' into eclair-mr2-plus-aosp
* commit '
a8a974bd171ccbc3b35b18c3e73a23d22834d05e':
Fix for
1974140. Delete entry if not valid on hitting home.
Eric Fischer [Fri, 30 Oct 2009 02:54:47 +0000 (19:54 -0700)]
am
7bb19a89: am
17fcd476: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
7bb19a892cdf94d017a2046b374f977d47d20597' into eclair-mr2-plus-aosp
* commit '
7bb19a892cdf94d017a2046b374f977d47d20597':
Import revised translations. DO NOT MERGE
Michael Chan [Fri, 30 Oct 2009 02:34:49 +0000 (19:34 -0700)]
am
0cb3743e: b/
2219381 Gray out Bluetooth Settings for the emulator
Merge commit '
0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-mr2
* commit '
0cb3743e93aef81e7669f1e6c81184559e0f8154':
b/
2219381 Gray out Bluetooth Settings for the emulator
Amith Yamasani [Fri, 30 Oct 2009 02:27:12 +0000 (19:27 -0700)]
am
dd45a47b: Merge change I4d31288f into eclair
Merge commit '
dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-mr2
* commit '
dd45a47bde9cdb9c27cb3ac3529a34f9789782ec':
Fix for
1974140. Delete entry if not valid on hitting home.
Eric Fischer [Fri, 30 Oct 2009 02:24:59 +0000 (19:24 -0700)]
am
17fcd476: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
17fcd476643e27943f548415e49e1be7d8e74ac1' into eclair-mr2
* commit '
17fcd476643e27943f548415e49e1be7d8e74ac1':
Import revised translations. DO NOT MERGE
Michael Chan [Fri, 30 Oct 2009 00:55:04 +0000 (17:55 -0700)]
am
0cb3743e: b/
2219381 Gray out Bluetooth Settings for the emulator
Merge commit '
0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-plus-aosp
* commit '
0cb3743e93aef81e7669f1e6c81184559e0f8154':
b/
2219381 Gray out Bluetooth Settings for the emulator
Mike Lockwood [Thu, 29 Oct 2009 21:43:12 +0000 (14:43 -0700)]
am
6dab602f: am
acfc96f1: am
53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in automatic mode.
Merge commit '
6dab602fdf7cdb41bebfd027ff94ab3edaf2132c'
* commit '
6dab602fdf7cdb41bebfd027ff94ab3edaf2132c':
Don't restore old brightness when cancelling brightness dialog in automatic mode.
Michael Chan [Thu, 29 Oct 2009 21:42:06 +0000 (14:42 -0700)]
b/
2219381 Gray out Bluetooth Settings for the emulator
Change-Id: I11ae2e6c7652ba550aeadf0dadb6f520c19dedc6
Mike Lockwood [Thu, 29 Oct 2009 20:56:08 +0000 (13:56 -0700)]
am
acfc96f1: am
53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in automatic mode.
Merge commit '
acfc96f1504ffa01fcdf78e9ff3c91917a9401c1' into eclair-mr2-plus-aosp
* commit '
acfc96f1504ffa01fcdf78e9ff3c91917a9401c1':
Don't restore old brightness when cancelling brightness dialog in automatic mode.
Mike Lockwood [Thu, 29 Oct 2009 20:45:44 +0000 (13:45 -0700)]
am
53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in automatic mode.
Merge commit '
53dcdeeb85e523e0b752d802d3413f5d4001d575' into eclair-mr2
* commit '
53dcdeeb85e523e0b752d802d3413f5d4001d575':
Don't restore old brightness when cancelling brightness dialog in automatic mode.
Amith Yamasani [Thu, 29 Oct 2009 13:35:07 +0000 (06:35 -0700)]
am
dd45a47b: Merge change I4d31288f into eclair
Merge commit '
dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-plus-aosp
* commit '
dd45a47bde9cdb9c27cb3ac3529a34f9789782ec':
Fix for
1974140. Delete entry if not valid on hitting home.
Android (Google) Code Review [Thu, 29 Oct 2009 13:28:35 +0000 (09:28 -0400)]
Merge change I4d31288f into eclair
* changes:
Fix for
1974140. Delete entry if not valid on hitting home.
Mike Cleron [Thu, 29 Oct 2009 08:56:06 +0000 (01:56 -0700)]
Mike Cleron [Thu, 29 Oct 2009 08:43:12 +0000 (01:43 -0700)]
am
ac465854: am
d02acfb9: Merge change I2abbb876 into eclair
Merge commit '
ac465854ac29aa001578c0fe0d64c71b213b1759' into eclair-mr2-plus-aosp
* commit '
ac465854ac29aa001578c0fe0d64c71b213b1759':
New widgets
Mike Cleron [Thu, 29 Oct 2009 08:26:57 +0000 (01:26 -0700)]
am
d02acfb9: Merge change I2abbb876 into eclair
Merge commit '
d02acfb908562780eec830a85e121f9925108c36' into eclair-mr2
* commit '
d02acfb908562780eec830a85e121f9925108c36':
New widgets
Eric Fischer [Thu, 29 Oct 2009 06:51:37 +0000 (23:51 -0700)]
am
4f75cca2: am
a4ec838d: am
e0711522: Use consistent punctuation for the Chinese locale names.
Merge commit '
4f75cca2cdc828fef6c09f3afea57e9ae771c0a2'
* commit '
4f75cca2cdc828fef6c09f3afea57e9ae771c0a2':
Use consistent punctuation for the Chinese locale names.
Jaikumar Ganesh [Thu, 29 Oct 2009 06:48:35 +0000 (23:48 -0700)]
am
afed5fca: am
760b45c2: am
195bc434: Add Authentication Type field to the APN settings.
Merge commit '
afed5fca00f781c5356cb1cf2ed7ee7f6326dc4c'
* commit '
afed5fca00f781c5356cb1cf2ed7ee7f6326dc4c':
Add Authentication Type field to the APN settings.
Eric Fischer [Thu, 29 Oct 2009 06:35:05 +0000 (23:35 -0700)]
am
17fcd476: Import revised translations. DO NOT MERGE
Merge commit '
17fcd476643e27943f548415e49e1be7d8e74ac1' into eclair-plus-aosp
* commit '
17fcd476643e27943f548415e49e1be7d8e74ac1':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 29 Oct 2009 04:19:37 +0000 (21:19 -0700)]
Import revised translations. DO NOT MERGE
Mike Lockwood [Thu, 29 Oct 2009 00:14:34 +0000 (17:14 -0700)]
am
53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in automatic mode.
Merge commit '
53dcdeeb85e523e0b752d802d3413f5d4001d575' into eclair-plus-aosp
* commit '
53dcdeeb85e523e0b752d802d3413f5d4001d575':
Don't restore old brightness when cancelling brightness dialog in automatic mode.
Amith Yamasani [Wed, 28 Oct 2009 23:59:17 +0000 (16:59 -0700)]
Fix for
1974140. Delete entry if not valid on hitting home.
If user doesn't enter an APN or name, then delete the entry on hitting home.
And if user has enough information but doesn't enter a name, then set the
name to "Untitled" to avoid blank APNs in the list.
Mike Lockwood [Wed, 28 Oct 2009 22:33:04 +0000 (18:33 -0400)]
Don't restore old brightness when cancelling brightness dialog in automatic mode.
Fixes a problem that could result in the backlight getting set to a bogus brightness
level if you open the dialog and cancel when in automatic mode.
Bug b/
2015734
Change-Id: I302697e4ebd37afcdbfdd74ba0b1cc9be27ee40b
Signed-off-by: Mike Lockwood <lockwood@android.com>
Eric Fischer [Wed, 28 Oct 2009 18:56:00 +0000 (11:56 -0700)]
am
a4ec838d: am
e0711522: Use consistent punctuation for the Chinese locale names.
Merge commit '
a4ec838d12c94b7103a4b3882ecda4ba28f6567b' into eclair-mr2-plus-aosp
* commit '
a4ec838d12c94b7103a4b3882ecda4ba28f6567b':
Use consistent punctuation for the Chinese locale names.
Eric Fischer [Wed, 28 Oct 2009 18:43:04 +0000 (11:43 -0700)]
am
e0711522: Use consistent punctuation for the Chinese locale names.
Merge commit '
e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-mr2
* commit '
e0711522bc5e7c62951b0e429c4b4550feeeabf0':
Use consistent punctuation for the Chinese locale names.
Jaikumar Ganesh [Wed, 28 Oct 2009 17:42:30 +0000 (10:42 -0700)]
am
760b45c2: am
195bc434: Add Authentication Type field to the APN settings.
Merge commit '
760b45c2a688876b94383561163244de8086f1c6' into eclair-mr2-plus-aosp
* commit '
760b45c2a688876b94383561163244de8086f1c6':
Add Authentication Type field to the APN settings.