OSDN Git Service
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 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: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
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.
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
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.
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 04:19:37 +0000 (21:19 -0700)]
Import revised translations. DO NOT MERGE
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.
Android (Google) Code Review [Wed, 28 Oct 2009 07:16:41 +0000 (03:16 -0400)]
Merge change I2abbb876 into eclair
* changes:
New widgets
Mike Cleron [Tue, 27 Oct 2009 21:05:27 +0000 (14:05 -0700)]
New widgets
Eric Fischer [Tue, 27 Oct 2009 00:54:44 +0000 (17:54 -0700)]
Use consistent punctuation for the Chinese locale names.
Bug
2216349
Jaikumar Ganesh [Mon, 26 Oct 2009 20:01:36 +0000 (13:01 -0700)]
Add Authentication Type field to the APN settings.
Bug:
1817100
Robert Greenwalt [Mon, 26 Oct 2009 21:33:53 +0000 (14:33 -0700)]
am
3f370d8e: am
0a4ab1ea: Disable Save of empty-named AP.
Merge commit '
3f370d8ef86b86cfe670745b9217896c2164f9a3'
* commit '
3f370d8ef86b86cfe670745b9217896c2164f9a3':
Disable Save of empty-named AP.
Amith Yamasani [Mon, 26 Oct 2009 21:33:44 +0000 (14:33 -0700)]
am
32ac2100: am
f0fed9dc: am
b3735744: Merge change I40dd2cfc into eclair
Merge commit '
32ac210016615fa6f0ee43ad5ffbc6d68ce75fab'
* commit '
32ac210016615fa6f0ee43ad5ffbc6d68ce75fab':
Fix for
2202408: Replace Never Timeout with 30 minutes
Neel Parekh [Mon, 26 Oct 2009 21:33:30 +0000 (14:33 -0700)]
am
c342f093: am
eb48882e: am
62d3407d: Minor change to use defined key rather than a string.
Merge commit '
c342f093453c077bfbd5b7a78c9f0c46c39ad271'
* commit '
c342f093453c077bfbd5b7a78c9f0c46c39ad271':
Minor change to use defined key rather than a string.
Robert Greenwalt [Mon, 26 Oct 2009 21:28:23 +0000 (14:28 -0700)]
am
0a4ab1ea: Disable Save of empty-named AP.
Merge commit '
0a4ab1eab20d5492bf7c87e348fd26d6c56889b9' into eclair-mr2-plus-aosp
* commit '
0a4ab1eab20d5492bf7c87e348fd26d6c56889b9':
Disable Save of empty-named AP.
Amith Yamasani [Mon, 26 Oct 2009 21:28:13 +0000 (14:28 -0700)]
am
f0fed9dc: am
b3735744: Merge change I40dd2cfc into eclair
Merge commit '
f0fed9dc8784f0635cd27c498beecc45e1f800be' into eclair-mr2-plus-aosp
* commit '
f0fed9dc8784f0635cd27c498beecc45e1f800be':
Fix for
2202408: Replace Never Timeout with 30 minutes
Neel Parekh [Mon, 26 Oct 2009 21:28:03 +0000 (14:28 -0700)]
am
eb48882e: am
62d3407d: Minor change to use defined key rather than a string.
Merge commit '
eb48882e18ba9b1241a4d79c0cd45d6994b6dec6' into eclair-mr2-plus-aosp
* commit '
eb48882e18ba9b1241a4d79c0cd45d6994b6dec6':
Minor change to use defined key rather than a string.
Robert Greenwalt [Mon, 26 Oct 2009 20:51:06 +0000 (13:51 -0700)]
Disable Save of empty-named AP.
Empty SSID names can cause weird problems, so don't allow the user to save them.
bug:
2211656
Amith Yamasani [Fri, 23 Oct 2009 17:17:43 +0000 (10:17 -0700)]
am
b3735744: Merge change I40dd2cfc into eclair
Merge commit '
b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-mr2
* commit '
b3735744fdd78a2098853d58a1fef6c643e7cb50':
Fix for
2202408: Replace Never Timeout with 30 minutes
Neel Parekh [Fri, 23 Oct 2009 17:17:38 +0000 (10:17 -0700)]
am
62d3407d: Minor change to use defined key rather than a string.
Merge commit '
62d3407de4a843cb83397fa757bc89653d78c800' into eclair-mr2
* commit '
62d3407de4a843cb83397fa757bc89653d78c800':
Minor change to use defined key rather than a string.
Android (Google) Code Review [Fri, 23 Oct 2009 17:09:14 +0000 (13:09 -0400)]
Merge change I40dd2cfc into eclair
* changes:
Fix for
2202408: Replace Never Timeout with 30 minutes
Patrick Scott [Fri, 23 Oct 2009 14:41:39 +0000 (07:41 -0700)]
Patrick Scott [Fri, 23 Oct 2009 14:29:08 +0000 (07:29 -0700)]
am
a2bfad13: Fix the build.
Merge commit '
a2bfad13995d8ee00ab084f1ce5c31aea5db1317' into eclair-mr2-plus-aosp
* commit '
a2bfad13995d8ee00ab084f1ce5c31aea5db1317':
Fix the build.
Patrick Scott [Fri, 23 Oct 2009 13:53:06 +0000 (09:53 -0400)]
Fix the build.
Amith Yamasani [Fri, 23 Oct 2009 03:57:32 +0000 (20:57 -0700)]
Fix for
2202408: Replace Never Timeout with 30 minutes
Maximum timeout is now 30 minutes. Never Timeout will cause
burn-in problems with OLED and a bit with LCD as well.
Neel Parekh [Fri, 23 Oct 2009 02:06:51 +0000 (19:06 -0700)]
am
83ee51b4: am
0bc64d45: resolved conflicts for merge of
e304b9f4 to eclair-mr2
Merge commit '
83ee51b4858bfdef133cbb2d103a0d5a3c635ab1'
* commit '
83ee51b4858bfdef133cbb2d103a0d5a3c635ab1':
Add a intent extra to only show the access points in the settings menu.
Neel Parekh [Fri, 23 Oct 2009 01:34:49 +0000 (18:34 -0700)]
am
0bc64d45: resolved conflicts for merge of
e304b9f4 to eclair-mr2
Merge commit '
0bc64d45b418c70dca77a74ddbea62612ae4fe19' into eclair-mr2-plus-aosp
* commit '
0bc64d45b418c70dca77a74ddbea62612ae4fe19':
Add a intent extra to only show the access points in the settings menu.
Neel Parekh [Fri, 23 Oct 2009 01:30:00 +0000 (18:30 -0700)]
Minor change to use defined key rather than a string.
Neel Parekh [Fri, 23 Oct 2009 01:26:46 +0000 (18:26 -0700)]
resolved conflicts for merge of
e304b9f4 to eclair-mr2
Neel Parekh [Fri, 23 Oct 2009 00:12:49 +0000 (17:12 -0700)]
Add a intent extra to only show the access points in the settings menu.
Bug:
2198865
Eric Fischer [Thu, 22 Oct 2009 16:46:47 +0000 (09:46 -0700)]
am
aa5a2807: (-s ours) am
53250b3a: am
8355d934: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
aa5a28077c2e6c76da6e6c7f634eaa6bd22a8f7e'
* commit '
aa5a28077c2e6c76da6e6c7f634eaa6bd22a8f7e':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 16:34:29 +0000 (09:34 -0700)]
am
53250b3a: am
8355d934: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
53250b3aa8c85adb31bfe9db30907f72acab7103' into eclair-mr2-plus-aosp
* commit '
53250b3aa8c85adb31bfe9db30907f72acab7103':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 13:45:55 +0000 (06:45 -0700)]
am
8355d934: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
8355d9343455eaacf559f0df0e752f236b7464d2' into eclair-mr2
* commit '
8355d9343455eaacf559f0df0e752f236b7464d2':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:47:42 +0000 (10:47 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Amith Yamasani [Mon, 19 Oct 2009 22:38:47 +0000 (15:38 -0700)]
am
28309905: am
8e10261e: am
941c3b17: Merge change I61c28c5f into eclair
Merge commit '
28309905ad2bcaff26d6773b2a20399296196e2e'
* commit '
28309905ad2bcaff26d6773b2a20399296196e2e':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes #
2176141
Amith Yamasani [Mon, 19 Oct 2009 22:33:43 +0000 (15:33 -0700)]
am
8e10261e: am
941c3b17: Merge change I61c28c5f into eclair
Merge commit '
8e10261e87cf4b474cde0acb5fd837272e8c147e' into eclair-mr2-plus-aosp
* commit '
8e10261e87cf4b474cde0acb5fd837272e8c147e':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes #
2176141
Amith Yamasani [Mon, 19 Oct 2009 22:27:14 +0000 (15:27 -0700)]
am
941c3b17: Merge change I61c28c5f into eclair
Merge commit '
941c3b1794203b48a8aa2e9d6f04c09d412262bd' into eclair-mr2
* commit '
941c3b1794203b48a8aa2e9d6f04c09d412262bd':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes #
2176141
Android (Google) Code Review [Mon, 19 Oct 2009 22:22:38 +0000 (18:22 -0400)]
Merge change I61c28c5f into eclair
* changes:
Use radio hunting time in addition to signal strength for cell standby computation. Fixes #
2176141
Amith Yamasani [Mon, 19 Oct 2009 18:45:18 +0000 (11:45 -0700)]
Use radio hunting time in addition to signal strength for cell standby computation. Fixes #
2176141
Tammo Spalink [Mon, 19 Oct 2009 03:20:12 +0000 (20:20 -0700)]
am
45bbba85: am
f239f3e0: Merge change Iec5461bc into eclair-mr2
Merge commit '
45bbba8543cb61dfef315d069d21bdd77d1dc81e'
* commit '
45bbba8543cb61dfef315d069d21bdd77d1dc81e':
Remove OEM-specific bits from RadioInfo.
Tammo Spalink [Mon, 19 Oct 2009 03:14:03 +0000 (20:14 -0700)]
am
f239f3e0: Merge change Iec5461bc into eclair-mr2
Merge commit '
f239f3e082edec0063de8c35bdf8045851252213' into eclair-mr2-plus-aosp
* commit '
f239f3e082edec0063de8c35bdf8045851252213':
Remove OEM-specific bits from RadioInfo.
Android (Google) Code Review [Mon, 19 Oct 2009 03:07:15 +0000 (23:07 -0400)]
Merge change Iec5461bc into eclair-mr2
* changes:
Remove OEM-specific bits from RadioInfo.
Mike Lockwood [Fri, 16 Oct 2009 16:50:08 +0000 (09:50 -0700)]
am
1d855b18: am
ee693a12: am
cdf42466: Remove PowerManager.setAutoBrightness()
Merge commit '
1d855b188354f9770eb1d261544123b9bb43e34d'
* commit '
1d855b188354f9770eb1d261544123b9bb43e34d':
Remove PowerManager.setAutoBrightness()
Mike Lockwood [Fri, 16 Oct 2009 16:43:20 +0000 (09:43 -0700)]
am
ee693a12: am
cdf42466: Remove PowerManager.setAutoBrightness()
Merge commit '
ee693a120ac57a84268d70447f12920827fbea6e' into eclair-mr2-plus-aosp
* commit '
ee693a120ac57a84268d70447f12920827fbea6e':
Remove PowerManager.setAutoBrightness()
Mike Lockwood [Fri, 16 Oct 2009 16:37:47 +0000 (09:37 -0700)]
am
cdf42466: Remove PowerManager.setAutoBrightness()
Merge commit '
cdf42466bf3471337f1355b872eb2d529ba9409c' into eclair-mr2
* commit '
cdf42466bf3471337f1355b872eb2d529ba9409c':
Remove PowerManager.setAutoBrightness()
Tammo Spalink [Thu, 15 Oct 2009 12:08:58 +0000 (20:08 +0800)]
Remove OEM-specific bits from RadioInfo.
The extracted bits will move into the HTC vendor tree, and it (or
similar settings for other vendors) can be accessed via a generic
OEM_RADIO_INFO activity.
Addresses issue:
http://buganizer/issue?id=
1645706
Change-Id: Iec5461bcb3e241a1230f5f6d53baa3bb838ff4a9
Mike Lockwood [Thu, 15 Oct 2009 04:19:04 +0000 (21:19 -0700)]
Remove PowerManager.setAutoBrightness()
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Change-Id: I1850549f513e3541b5761aae28ebc615410377de
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:20:05 +0000 (16:20 -0700)]
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:18 +0000 (16:02 -0700)]
merge from open-source master
Eric Fischer [Wed, 14 Oct 2009 00:24:38 +0000 (17:24 -0700)]
am
889f7568: (-s ours) am
880daa29: Merge change I1b21ba17 into eclair-mr2
Merge commit '
889f756808998691ec8dc22e55f80e8f9a528893'
* commit '
889f756808998691ec8dc22e55f80e8f9a528893':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 14 Oct 2009 00:12:43 +0000 (17:12 -0700)]
am
880daa29: Merge change I1b21ba17 into eclair-mr2
Merge commit '
880daa29161330c97e65101659ed6b88066a3dbe' into eclair-mr2-plus-aosp
* commit '
880daa29161330c97e65101659ed6b88066a3dbe':
Import revised translations. DO NOT MERGE
Dianne Hackborn [Wed, 14 Oct 2009 00:11:43 +0000 (17:11 -0700)]
am
8271a531: am
3539cc5e: am
9f1900dc: Fix issue #
2185893: Can not install 3D Media Gallery
Merge commit '
8271a531b73ffa82202a223d28581c7c44e03d35'
* commit '
8271a531b73ffa82202a223d28581c7c44e03d35':
Fix issue #
2185893: Can not install 3D Media Gallery
Chung-yih Wang [Wed, 14 Oct 2009 00:06:02 +0000 (17:06 -0700)]
am
2683c04a: am
5676ccab: Merge change I69ea4234 into eclair-mr2
Merge commit '
2683c04ae8bf2db63f9ea2c4031854b98eed21ce'
* commit '
2683c04ae8bf2db63f9ea2c4031854b98eed21ce':
Remove the getHumanReadibleSsid().
Hung-ying Tyan [Wed, 14 Oct 2009 00:05:51 +0000 (17:05 -0700)]
am
ae59063b: am
f20623b2: Merge change I6983cab3 into eclair-mr2
Merge commit '
ae59063b7afc234216050c9b5a99b1dc878754e7'
* commit '
ae59063b7afc234216050c9b5a99b1dc878754e7':
Add saving/restoring state in CredentialInstaller and ...
Chung-yih Wang [Wed, 14 Oct 2009 00:05:12 +0000 (17:05 -0700)]
am
c0ef160b: am
a5b7b45b: Push down the supplicant-specific double-quote handling to framework.
Merge commit '
c0ef160be719ae320e9d9574898ec9eef01ceb55'
* commit '
c0ef160be719ae320e9d9574898ec9eef01ceb55':
Push down the supplicant-specific double-quote handling to framework.
Android (Google) Code Review [Wed, 14 Oct 2009 00:01:09 +0000 (20:01 -0400)]
Merge change I1b21ba17 into eclair-mr2
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 13 Oct 2009 23:43:35 +0000 (16:43 -0700)]
Reimport translations.
Change-Id: I0127a0ad80f0736263d4e5dd01371184f2e16cdf
Eric Fischer [Tue, 13 Oct 2009 23:07:48 +0000 (16:07 -0700)]
Import revised translations. DO NOT MERGE
Dianne Hackborn [Tue, 13 Oct 2009 22:56:52 +0000 (15:56 -0700)]
am
3539cc5e: am
9f1900dc: Fix issue #
2185893: Can not install 3D Media Gallery
Merge commit '
3539cc5ef317b58c0e12c083d7cbda942658cad0' into eclair-mr2-plus-aosp
* commit '
3539cc5ef317b58c0e12c083d7cbda942658cad0':
Fix issue #
2185893: Can not install 3D Media Gallery
OSDN Git Service
