OSDN Git Service
Amith Yamasani [Wed, 2 Dec 2009 17:55:29 +0000 (09:55 -0800)]
am
379953de: am
8f2fb65b: Setting in Sound & Display for trackball pulsing on notification. Bug #
2238250
Merge commit '
379953def17d6aec7a07a01a7d337403c63bdf44' into eclair-mr2-plus-aosp
* commit '
379953def17d6aec7a07a01a7d337403c63bdf44':
Setting in Sound & Display for trackball pulsing on notification. Bug #
2238250
Amith Yamasani [Wed, 2 Dec 2009 17:50:05 +0000 (09:50 -0800)]
am
8f2fb65b: Setting in Sound & Display for trackball pulsing on notification. Bug #
2238250
Merge commit '
8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-mr2
* commit '
8f2fb65b360ebc7ed71ddbc884451536e5e99c03':
Setting in Sound & Display for trackball pulsing on notification. Bug #
2238250
Amith Yamasani [Wed, 2 Dec 2009 03:06:14 +0000 (19:06 -0800)]
Setting in Sound & Display for trackball pulsing on notification. Bug #
2238250
Eric Fischer [Wed, 2 Dec 2009 01:29:37 +0000 (17:29 -0800)]
am
42b78b6b: am
76395bc9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
42b78b6b4cca4b1b4a6dbd2cdc75d02ea2821d6a' into eclair-mr2-plus-aosp
* commit '
42b78b6b4cca4b1b4a6dbd2cdc75d02ea2821d6a':
Import revised translations. DO NOT MERGE
Irfan Sheriff [Wed, 2 Dec 2009 01:17:26 +0000 (17:17 -0800)]
am
60e57143: Missing Forget button after doing Add Network on an AP in the scanned list
Merge commit '
60e5714311f4ec6d0135397b2beeb5dd511cf318' into eclair-mr2-plus-aosp
* commit '
60e5714311f4ec6d0135397b2beeb5dd511cf318':
Missing Forget button after doing Add Network on an AP in the scanned list
Jaikumar Ganesh [Wed, 2 Dec 2009 01:17:22 +0000 (17:17 -0800)]
am
6c01d130: Merge change I42499a85 into eclair-mr2
Merge commit '
6c01d1305e5c9c7434f4573872c94937a2b3957a' into eclair-mr2-plus-aosp
* commit '
6c01d1305e5c9c7434f4573872c94937a2b3957a':
Change priority for Headset profile on the same lines as A2DP profile.
Eric Fischer [Wed, 2 Dec 2009 01:12:09 +0000 (17:12 -0800)]
am
76395bc9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
76395bc9bc0f2db49d37fd94017c01ca1c8fb1a7' into eclair-mr2
* commit '
76395bc9bc0f2db49d37fd94017c01ca1c8fb1a7':
Import revised translations. DO NOT MERGE
Irfan Sheriff [Tue, 1 Dec 2009 23:59:08 +0000 (15:59 -0800)]
Missing Forget button after doing Add Network on an AP in the scanned list
Problem:
On the Wifi Settings screen, if instead of clicking on the AP shown on the scanned list, we do an "Add Wi-Fi network" and enter the AP information - the AP information gets stored and the client device connects to the AP. Afterwards, if we click on the AP again the "Forget" button does not appear until we exit the Wifi Settings screen and return.
Root cause and Fix:
mApScanList in WifiLayer tracks the list of APs shown. Upon doing a connect through a direct click, the configured state for the AP in the list updated. However, if we do an Add Network, the configured state on mApScanList remains unupdated. This causes the Settings screen to not show "Forget" for the AP when it is clicked.
The fix is to set the Configured state to true in handleSave() by fetching the AP state stored in WifiLayer.
Bug:
2296038
Change-id: I70c545905a4984a03a0f235f3baf17cd36688710
Android (Google) Code Review [Tue, 1 Dec 2009 20:45:41 +0000 (12:45 -0800)]
Merge change I42499a85 into eclair-mr2
* changes:
Change priority for Headset profile on the same lines as A2DP profile.
Eric Fischer [Mon, 30 Nov 2009 19:38:40 +0000 (11:38 -0800)]
Import revised translations. DO NOT MERGE
Paul Westbrook [Mon, 30 Nov 2009 18:40:09 +0000 (10:40 -0800)]
am
4cb03801: Merge change Ia74e2b5c into eclair-mr2
Merge commit '
4cb03801ebb4ce3c4f1b2d770f1033677446d6ca' into eclair-mr2-plus-aosp
* commit '
4cb03801ebb4ce3c4f1b2d770f1033677446d6ca':
Switched Settings to use the new Gmail permission name space
Android (Google) Code Review [Mon, 30 Nov 2009 18:36:39 +0000 (10:36 -0800)]
Merge change Ia74e2b5c into eclair-mr2
* changes:
Switched Settings to use the new Gmail permission name space
Jaikumar Ganesh [Wed, 25 Nov 2009 23:54:25 +0000 (15:54 -0800)]
Change priority for Headset profile on the same lines as A2DP profile.
AUTO_CONNECT => we auto_connect.
ON => Settings app box is checked and we allow incoming connections.
OFF => Settings app check box is unchecked.
Jaikumar Ganesh [Wed, 25 Nov 2009 23:41:30 +0000 (15:41 -0800)]
am
210667f3: Update to reflect new priorities for A2DP profile.
Merge commit '
210667f353a6703c6518dfe3fcfc9cd40ad32fff' into eclair-mr2-plus-aosp
* commit '
210667f353a6703c6518dfe3fcfc9cd40ad32fff':
Update to reflect new priorities for A2DP profile.
Jaikumar Ganesh [Tue, 24 Nov 2009 22:43:45 +0000 (14:43 -0800)]
Update to reflect new priorities for A2DP profile.
1. PRIORITY_OFF is when it is unchecked.
2. PRIORITY_ON is when it is checked.
3. PRIORITY_AUTO_CONNECT is when we want to auto connect.
When the box is checked, we want to auto connect,
so set the priority to AUTO_CONNECT.
When the user disconnects, we set the priority back
to PRIORITY_ON.
Paul Westbrook [Sat, 21 Nov 2009 01:12:36 +0000 (17:12 -0800)]
Switched Settings to use the new Gmail permission name space
Eric Fischer [Tue, 17 Nov 2009 04:03:49 +0000 (20:03 -0800)]
am
b459a335: am
18517f50: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
b459a335459cd2be551d51b5650868424948f367' into eclair-mr2-plus-aosp
* commit '
b459a335459cd2be551d51b5650868424948f367':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 17 Nov 2009 03:53:51 +0000 (19:53 -0800)]
am
18517f50: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
18517f50edcfebf41b61965b24e360858db1c5e4' into eclair-mr2
* commit '
18517f50edcfebf41b61965b24e360858db1c5e4':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 17 Nov 2009 00:45:29 +0000 (16:45 -0800)]
Import revised translations. DO NOT MERGE
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: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: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: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: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: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
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: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 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 [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 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
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: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: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.
Jaikumar Ganesh [Wed, 28 Oct 2009 17:30:20 +0000 (10:30 -0700)]
am
195bc434: Add Authentication Type field to the APN settings.
Merge commit '
195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-mr2
* commit '
195bc43460967e57e4c1131ba156083a93e0e4e8':
Add Authentication Type field to the APN settings.
Mike Cleron [Wed, 28 Oct 2009 07:22:03 +0000 (00:22 -0700)]
am
d02acfb9: Merge change I2abbb876 into eclair
Merge commit '
d02acfb908562780eec830a85e121f9925108c36' into eclair-plus-aosp
* commit '
d02acfb908562780eec830a85e121f9925108c36':
New widgets
OSDN Git Service
