OSDN Git Service
Amith Yamasani [Wed, 3 Feb 2010 17:46:47 +0000 (09:46 -0800)]
Fix an NPE in Volume dialog when notification volume is tied to ringer volume.
Chia-chi Yeh [Wed, 3 Feb 2010 07:56:55 +0000 (15:56 +0800)]
WifiSettings: rename WifiSettings2 to WifiSettings.
Chia-chi Yeh [Wed, 3 Feb 2010 06:38:12 +0000 (14:38 +0800)]
WifiSettings: remove dead code.
San Mehat [Tue, 2 Feb 2010 20:54:46 +0000 (12:54 -0800)]
Settings: Refactor for StorageManager namespace change
Signed-off-by: San Mehat <san@google.com>
San Mehat [Fri, 29 Jan 2010 14:09:06 +0000 (06:09 -0800)]
Settings: Refactor for new API & remove obsolete setting
Signed-off-by: San Mehat <san@google.com>
Chia-chi Yeh [Mon, 25 Jan 2010 07:41:42 +0000 (15:41 +0800)]
WifiSettings: revise and add support for editing EAP networks.
Use arrays.xml to store translations for enumerations;
avoid race conditions happened when pop up menu or dialog;
avoid saving configurations with networks disabled;
use the same layout for all the dialogs;
support editing EAP networks;
only unlock keystore before connecting;
and many bug fixes I cannot remember.
The number of lines in the new code is about 1/3 of the old one,
and it improves the readability a lot!
Suchi Amalapurapu [Sat, 30 Jan 2010 03:34:30 +0000 (19:34 -0800)]
Merge "Convert menu options to tabs Add new tab for apps on sd"
Dianne Hackborn [Fri, 29 Jan 2010 18:49:32 +0000 (10:49 -0800)]
Update to follow password mode->quality API change.
Irfan Sheriff [Fri, 29 Jan 2010 04:45:57 +0000 (20:45 -0800)]
Merge "Allow channel count modification on userdebug"
Amith Yamasani [Thu, 28 Jan 2010 23:13:16 +0000 (15:13 -0800)]
Merge "Update display icon for settings top-level."
Amith Yamasani [Thu, 28 Jan 2010 22:54:24 +0000 (14:54 -0800)]
Update display icon for settings top-level.
Suchi Amalapurapu [Thu, 28 Jan 2010 18:50:19 +0000 (10:50 -0800)]
Convert menu options to tabs
Add new tab for apps on sd
Irfan Sheriff [Thu, 28 Jan 2010 17:24:57 +0000 (09:24 -0800)]
Allow channel count modification on userdebug
Bug:
2378844
Change-Id: I62bca602c3fe1fefdc4a4517573b2c3db9d53a1f
Dianne Hackborn [Thu, 28 Jan 2010 03:25:48 +0000 (19:25 -0800)]
Update to follow device policy changes.
Dianne Hackborn [Thu, 28 Jan 2010 00:22:05 +0000 (16:22 -0800)]
Update settings UI to support multiple device admins.
Irfan Sheriff [Wed, 27 Jan 2010 23:52:35 +0000 (15:52 -0800)]
am
8e79fda8: am
ad76f17a: Remove regulatory group setting in advanced wifi setting
Merge commit '
8e79fda826f78afe063763183d31398cdee5ac84'
* commit '
8e79fda826f78afe063763183d31398cdee5ac84':
Remove regulatory group setting in advanced wifi setting
Dianne Hackborn [Wed, 27 Jan 2010 02:03:42 +0000 (18:03 -0800)]
More device admin work:
- Show a warning before removing an admin, if desired.
- Additional message that can be shown when adding an admin.
Mike LeBeau [Wed, 27 Jan 2010 02:37:59 +0000 (21:37 -0500)]
Remove trailing "settings" from the strings for the items under the
new "Voice input & output" top-level settings section.
Dianne Hackborn [Tue, 26 Jan 2010 02:56:17 +0000 (18:56 -0800)]
Work on the device admin settings UI.
Improve the look of the UI, and add the confirmation screen
for enabling an administrator. This uses the new framework APIs
to show its description and policies it will control.
Daniel Sandler [Sat, 23 Jan 2010 01:47:15 +0000 (20:47 -0500)]
Add android.settings.DEVICE_INFO_SETTINGS.
Allows apps to jump straight to the DeviceInfoSettings
Activity.
Mike LeBeau [Tue, 26 Jan 2010 02:37:50 +0000 (18:37 -0800)]
Merge "Add a new "Voice input & output" top-level section of system settings. This replaces the existing "Text-to-speech" section, placing that inside, along with a link to the newly exposed voice search settings (which will soon be expanded) and a link to the LatinIME settings (pending a link to a new section in LatinIME for just voice settings, including the comma setting and a new input language setting)."
Michael Chan [Tue, 26 Jan 2010 02:09:45 +0000 (18:09 -0800)]
am
3a6b2df2: am
324ab848: Merge "b/
2370089 Pop the dock dialog above the keyguard" into eclair
Merge commit '
3a6b2df23950cd64c10dfbb437aa56a99cbce54a'
* commit '
3a6b2df23950cd64c10dfbb437aa56a99cbce54a':
b/
2370089 Pop the dock dialog above the keyguard
Mike LeBeau [Mon, 25 Jan 2010 23:18:45 +0000 (18:18 -0500)]
Add a new "Voice input & output" top-level section of system settings.
This replaces the existing "Text-to-speech" section, placing that
inside, along with a link to the newly exposed voice search settings
(which will soon be expanded) and a link to the LatinIME settings
(pending a link to a new section in LatinIME for just voice settings,
including the comma setting and a new input language setting).
The VoiceSearch and LatinIME links are smart enough to remove themselves
if those don't exist on the device.
Amith Yamasani [Mon, 25 Jan 2010 23:06:21 +0000 (15:06 -0800)]
Merge "Refactor settings hierarchy and clump all volumes in one dialog."
Amith Yamasani [Mon, 25 Jan 2010 17:17:53 +0000 (09:17 -0800)]
Refactor settings hierarchy and clump all volumes in one dialog.
Bug:
2362077 Bug:
2312836 Bug:
2166486
Split Sound and Display into separate top-level settings.
All volume settings (including Alarm volume) now in one Volume dialog.
Remove some sub-texts to reduce clutter.
Charles Chen [Mon, 25 Jan 2010 22:04:41 +0000 (14:04 -0800)]
Merge "Changing TextToSpeechSettings to query for the sample text strings provided by plugins rather than using hardcoded sample text."
Charles Chen [Fri, 22 Jan 2010 19:17:40 +0000 (11:17 -0800)]
Changing TextToSpeechSettings to query for the sample text
strings provided by plugins rather than using hardcoded sample
text.
Bjorn Bringert [Mon, 25 Jan 2010 20:45:17 +0000 (12:45 -0800)]
Merge "Fix GoogleSettings check in PrivacySettings"
Bjorn Bringert [Mon, 25 Jan 2010 20:30:39 +0000 (20:30 +0000)]
Fix GoogleSettings check in PrivacySettings
GoogleSettingsProvider has moved to a new package as part of unbundling.
This broke the check used to decide whether to show the "Backup my
settings" preference. To make this more robust to package name changes,
I changed the code to look up the settings provider by authority
instead of looking for the package that contains it.
Fixes http://b/issue?id=
2390945
Change-Id: Iaec3152faddbd938fc02f9f2dde748819c1d5cdf
Eric Fischer [Mon, 25 Jan 2010 17:09:23 +0000 (09:09 -0800)]
am
6795dd59: (-s ours) am
359b2bcc: Check in translations for new Settings strings. DO NOT MERGE
Merge commit '
6795dd59aa1a1d78ea0b3c7fc44107f38cae80d7'
* commit '
6795dd59aa1a1d78ea0b3c7fc44107f38cae80d7':
Check in translations for new Settings strings. DO NOT MERGE
Michael Chan [Sat, 23 Jan 2010 02:49:07 +0000 (18:49 -0800)]
am
fcd4e7fe: am
04bdae75: Merge "b/
2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly." into eclair
Merge commit '
fcd4e7fec3c80d0a16630246c4942595d34c655c'
* commit '
fcd4e7fec3c80d0a16630246c4942595d34c655c':
b/
2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
Amith Yamasani [Fri, 22 Jan 2010 20:36:04 +0000 (12:36 -0800)]
am
b9f29667: am
63c6a309: Merge "Add dock icon for top-level settings. #
2367275" into eclair
Merge commit '
b9f2966707004b84760b498d8fc05b3c8f144f59'
* commit '
b9f2966707004b84760b498d8fc05b3c8f144f59':
Add dock icon for top-level settings. #
2367275
Michael Chan [Fri, 22 Jan 2010 20:35:59 +0000 (12:35 -0800)]
am
97ed3f4b: am
3fe86a34: b/
2332395 Disable BT when undocked if BT was off to at docking time unless if 1) the user has manually turned off bt while docked or 2) there\'s a connect device at the time we are ready to turn off bt
Merge commit '
97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7'
* commit '
97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7':
b/
2332395 Disable BT when undocked if BT was off to at docking time
Amith Yamasani [Fri, 22 Jan 2010 01:54:53 +0000 (17:54 -0800)]
Amith Yamasani [Fri, 22 Jan 2010 01:54:47 +0000 (17:54 -0800)]
am
39c3d10b: am
0e2ab4f8: New top-level Dock in Settings and a Dock Settings screen with Audio item. #
2367275
Merge commit '
39c3d10bfccd74b26b045e3d6a712d282fba88d8'
* commit '
39c3d10bfccd74b26b045e3d6a712d282fba88d8':
New top-level Dock in Settings and a Dock Settings screen with Audio item. #
2367275
Dianne Hackborn [Wed, 20 Jan 2010 21:40:19 +0000 (13:40 -0800)]
Start hooking up password device policies
This introduces a new activity for changing the password, which takes
care of launching the correct password activity based on the caller's
request and active policy. The security settings activity now uses
this, and it implements the API action for launching the password UI.
Irfan Sheriff [Thu, 21 Jan 2010 18:44:31 +0000 (10:44 -0800)]
am
ad76f17a: Remove regulatory group setting in advanced wifi setting
Merge commit '
ad76f17a1c75447047fc2791b65e93341925998b' into eclair-plus-aosp
* commit '
ad76f17a1c75447047fc2791b65e93341925998b':
Remove regulatory group setting in advanced wifi setting
Irfan Sheriff [Thu, 21 Jan 2010 18:01:15 +0000 (10:01 -0800)]
Remove regulatory group setting in advanced wifi setting
Bug:
2378844
Change-Id: I2eefa73cca238ab04842ffc8f8968dac5f953456
Michael Chan [Thu, 21 Jan 2010 00:10:29 +0000 (16:10 -0800)]
am
324ab848: Merge "b/
2370089 Pop the dock dialog above the keyguard" into eclair
Merge commit '
324ab8489cdc8ad4bff4e366940fa16e455f5933' into eclair-plus-aosp
* commit '
324ab8489cdc8ad4bff4e366940fa16e455f5933':
b/
2370089 Pop the dock dialog above the keyguard
Michael Chan [Thu, 21 Jan 2010 00:06:44 +0000 (16:06 -0800)]
Merge "b/
2370089 Pop the dock dialog above the keyguard" into eclair
Eric Fischer [Wed, 20 Jan 2010 23:59:27 +0000 (15:59 -0800)]
am
359b2bcc: Check in translations for new Settings strings. DO NOT MERGE
Merge commit '
359b2bccd9b96348d4bad949b000c8310ffe9386' into eclair-plus-aosp
* commit '
359b2bccd9b96348d4bad949b000c8310ffe9386':
Check in translations for new Settings strings. DO NOT MERGE
Michael Chan [Wed, 20 Jan 2010 23:39:13 +0000 (15:39 -0800)]
b/
2370089 Pop the dock dialog above the keyguard
Change-Id: I958ac22defb057fd1ce98a711e3e92073588b1e8
Eric Fischer [Wed, 20 Jan 2010 23:38:48 +0000 (15:38 -0800)]
Check in translations for new Settings strings. DO NOT MERGE
Jim Miller [Wed, 20 Jan 2010 23:12:14 +0000 (15:12 -0800)]
Merge "Fix
2385283: Add DevicePolicyManager calls to LockScreen."
Amith Yamasani [Wed, 20 Jan 2010 22:36:08 +0000 (14:36 -0800)]
am
3b7ffa5e: am
01a868d7: Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair
Merge commit '
3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df'
* commit '
3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df':
Strings for new Dock settings screen, to get started on the L10N.
Michael Chan [Wed, 20 Jan 2010 22:35:08 +0000 (14:35 -0800)]
am
49efbf8b: am
c9b9f650: Merge "b/
2367861 Auto connect if the user turns on BT while docked." into eclair
Merge commit '
49efbf8b5b7a6817a4a1020982cb34f4ca226d48'
* commit '
49efbf8b5b7a6817a4a1020982cb34f4ca226d48':
b/
2367861 Auto connect if the user turns on BT while docked.
Jim Miller [Wed, 20 Jan 2010 21:37:14 +0000 (13:37 -0800)]
Fix
2385283: Add DevicePolicyManager calls to LockScreen.
Michael Chan [Wed, 20 Jan 2010 19:54:51 +0000 (11:54 -0800)]
am
04bdae75: Merge "b/
2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly." into eclair
Merge commit '
04bdae750fe47d3a008af92c5bfb5eba1e0e6807' into eclair-plus-aosp
* commit '
04bdae750fe47d3a008af92c5bfb5eba1e0e6807':
b/
2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
Michael Chan [Wed, 20 Jan 2010 19:51:02 +0000 (11:51 -0800)]
Merge "b/
2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly." into eclair
Amith Yamasani [Wed, 20 Jan 2010 15:45:26 +0000 (07:45 -0800)]
am
63c6a309: Merge "Add dock icon for top-level settings. #
2367275" into eclair
Merge commit '
63c6a30908a14cdc8cccee3f6a3e88275dcec30e' into eclair-plus-aosp
* commit '
63c6a30908a14cdc8cccee3f6a3e88275dcec30e':
Add dock icon for top-level settings. #
2367275
Michael Chan [Wed, 20 Jan 2010 15:45:23 +0000 (07:45 -0800)]
am
3fe86a34: b/
2332395 Disable BT when undocked if BT was off to at docking time unless if 1) the user has manually turned off bt while docked or 2) there\'s a connect device at the time we are ready to turn off bt
Merge commit '
3fe86a346cdcd41fd9498591571d8b512a130240' into eclair-plus-aosp
* commit '
3fe86a346cdcd41fd9498591571d8b512a130240':
b/
2332395 Disable BT when undocked if BT was off to at docking time
Amith Yamasani [Wed, 20 Jan 2010 15:37:33 +0000 (07:37 -0800)]
Merge "Add dock icon for top-level settings. #
2367275" into eclair
Amith Yamasani [Wed, 20 Jan 2010 14:25:32 +0000 (06:25 -0800)]
Add dock icon for top-level settings. #
2367275
Added mdpi and hdpi icons, and updated settings.xml to point to them.
Michael Chan [Wed, 20 Jan 2010 06:35:28 +0000 (22:35 -0800)]
b/
2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
Change-Id: Ifa721afa9c4a9d83a4dd70ed75f5d66ec06a01f6
Michael Chan [Fri, 15 Jan 2010 01:52:40 +0000 (17:52 -0800)]
b/
2332395 Disable BT when undocked if BT was off to at docking time
unless if 1) the user has manually turned off bt while docked or
2) there's a connect device at the time we are ready to turn off bt
Change-Id: Ic27308688a525120a09a25c9416b3cdc477412ab
Amith Yamasani [Tue, 19 Jan 2010 07:43:05 +0000 (23:43 -0800)]
am
6ff80dcf: Fix #
2377870 : NPE in Dock settings
Merge commit '
6ff80dcf7a9e97545be90a4c8e9a85e8a311de96' into eclair-plus-aosp
* commit '
6ff80dcf7a9e97545be90a4c8e9a85e8a311de96':
Fix #
2377870 : NPE in Dock settings
Amith Yamasani [Tue, 19 Jan 2010 07:42:44 +0000 (23:42 -0800)]
am
0e2ab4f8: New top-level Dock in Settings and a Dock Settings screen with Audio item. #
2367275
Merge commit '
0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a' into eclair-plus-aosp
* commit '
0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a':
New top-level Dock in Settings and a Dock Settings screen with Audio item. #
2367275
Dianne Hackborn [Wed, 13 Jan 2010 02:18:05 +0000 (18:18 -0800)]
Initial UI for managing device policies.
More to come... what is here now is very ugly, and completely missing the
confirmation screen for setting a device administrator.
Amith Yamasani [Sat, 16 Jan 2010 03:10:55 +0000 (19:10 -0800)]
Fix #
2377870 : NPE in Dock settings
If the Dock settings is launched after reboot but before it is docked,
the settings screen crashes because the dock status is not available.
This fixes the case where there was never a pending intent for dock status.
Chia-chi Yeh [Fri, 15 Jan 2010 23:04:15 +0000 (07:04 +0800)]
WifiEnabler: add support to show supplicant state.
Amith Yamasani [Fri, 15 Jan 2010 00:12:21 +0000 (16:12 -0800)]
New top-level Dock in Settings and a Dock Settings screen with Audio item. #
2367275
Add a new top-level setting for car/desktop dock settings.
Sub menu contains one item - Audio (settings)
Sub text for Audio shows current docked status and launches either the
audio settings or a dialog saying that you're not docked and you need to
buy a new dock from Google (kidding).
Amith Yamasani [Fri, 15 Jan 2010 01:04:45 +0000 (17:04 -0800)]
am
01a868d7: Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair
Merge commit '
01a868d73b2c0a8c969a4ad37af0e0a98a9eb156' into eclair-plus-aosp
* commit '
01a868d73b2c0a8c969a4ad37af0e0a98a9eb156':
Strings for new Dock settings screen, to get started on the L10N.
Amith Yamasani [Fri, 15 Jan 2010 00:33:15 +0000 (16:33 -0800)]
Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair
Amith Yamasani [Fri, 15 Jan 2010 00:21:51 +0000 (16:21 -0800)]
Strings for new Dock settings screen, to get started on the L10N.
Michael Chan [Thu, 14 Jan 2010 23:20:31 +0000 (15:20 -0800)]
am
c9b9f650: Merge "b/
2367861 Auto connect if the user turns on BT while docked." into eclair
Merge commit '
c9b9f650fcbce8ba2ab0b2e60e5334b02b4010e5' into eclair-plus-aosp
* commit '
c9b9f650fcbce8ba2ab0b2e60e5334b02b4010e5':
b/
2367861 Auto connect if the user turns on BT while docked.
Michael Chan [Thu, 14 Jan 2010 23:17:30 +0000 (15:17 -0800)]
Merge "b/
2367861 Auto connect if the user turns on BT while docked." into eclair
Chia-chi Yeh [Tue, 12 Jan 2010 22:11:29 +0000 (06:11 +0800)]
Settings: revise WifiEnabler and BluetoothEnabler.
This mainly changes the way both enablers react to the airplane mode. Now
enablers show a toast message instead of disabling the check box directly. This
avoids the inconsistent state introduced by WirelessSettings which controls the
check box using layout dependency.
Related bug:
2053751
Michael Chan [Thu, 14 Jan 2010 00:31:39 +0000 (16:31 -0800)]
b/
2367861 Auto connect if the user turns on BT while docked.
Change-Id: I855d0448af9c9c665fb8288c83cd13ae9c3d6050
Suchi Amalapurapu [Wed, 13 Jan 2010 00:41:21 +0000 (16:41 -0800)]
Merge "Change filter options from being menu items to tabbed views. Remove unused strings."
Suchi Amalapurapu [Wed, 6 Jan 2010 06:46:09 +0000 (22:46 -0800)]
Change filter options from being menu items to tabbed views.
Remove unused strings.
Amith Yamasani [Wed, 13 Jan 2010 00:14:30 +0000 (16:14 -0800)]
am
213c35c0: (-s ours) am
d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug #
2358489. DO NOT MERGE" into eclair
Merge commit '
213c35c052375632487469c88227883ff1a0f1ac'
* commit '
213c35c052375632487469c88227883ff1a0f1ac':
Don't allow monkey to play with SIM lock settings. Bug #
2358489. DO NOT MERGE
Amith Yamasani [Wed, 13 Jan 2010 00:12:28 +0000 (16:12 -0800)]
am
d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug #
2358489. DO NOT MERGE" into eclair
Merge commit '
d8d2127936faac93806e5a64447cee0fd8dd2d62' into eclair-plus-aosp
* commit '
d8d2127936faac93806e5a64447cee0fd8dd2d62':
Don't allow monkey to play with SIM lock settings. Bug #
2358489. DO NOT MERGE
Amith Yamasani [Wed, 13 Jan 2010 00:10:17 +0000 (16:10 -0800)]
Merge "Don't allow monkey to play with SIM lock settings. Bug #
2358489. DO NOT MERGE" into eclair
Amith Yamasani [Fri, 8 Jan 2010 03:05:07 +0000 (19:05 -0800)]
Don't allow monkey to play with SIM lock settings. Bug #
2358489. DO NOT MERGE
Backport from froyo.
If the monkey is running, exit the SIM lock settings activity.
Amith Yamasani [Tue, 12 Jan 2010 22:24:15 +0000 (14:24 -0800)]
Merge "Haptic feedback setting doesn't need to be disabled in Silent mode."
Amith Yamasani [Tue, 12 Jan 2010 22:22:51 +0000 (14:22 -0800)]
Haptic feedback setting doesn't need to be disabled in Silent mode.
Removed dependency on silent mode setting. Must have been a copy/paste error.
San Mehat [Tue, 12 Jan 2010 21:50:28 +0000 (13:50 -0800)]
Merge "Settings: Switch to new MountService api names"
Michael Chan [Tue, 12 Jan 2010 21:45:36 +0000 (13:45 -0800)]
am
d69a5ee2: am
c5aa68f3: b/
2367020 Enable bt profiles by default for car dock.
Merge commit '
d69a5ee28cb5164233805a751a7c3deafba58668'
* commit '
d69a5ee28cb5164233805a751a7c3deafba58668':
b/
2367020 Enable bt profiles by default for car dock.
Michael Chan [Tue, 12 Jan 2010 21:42:04 +0000 (13:42 -0800)]
am
c5aa68f3: b/
2367020 Enable bt profiles by default for car dock.
Merge commit '
c5aa68f3f2201227e85e52ee33937e70e7741c3c' into eclair-plus-aosp
* commit '
c5aa68f3f2201227e85e52ee33937e70e7741c3c':
b/
2367020 Enable bt profiles by default for car dock.
Michael Chan [Tue, 12 Jan 2010 19:39:15 +0000 (11:39 -0800)]
b/
2367020 Enable bt profiles by default for car dock.
Change-Id: I95b1330ab432d38fb509321d843d04a41185d331
San Mehat [Tue, 12 Jan 2010 20:22:37 +0000 (12:22 -0800)]
Settings: Switch to new MountService api names
Signed-off-by: San Mehat <san@google.com>
Jim Miller [Wed, 23 Dec 2009 03:04:57 +0000 (19:04 -0800)]
Fix
2332563: Add password-lock support to lockscreen
Michael Chan [Mon, 11 Jan 2010 23:19:50 +0000 (15:19 -0800)]
am
79270566: (-s ours) am
d9d8ef26: Merge "b/
2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE" into eclair
Merge commit '
79270566b178ed7efc1c62f8410822d46d6e3152'
* commit '
79270566b178ed7efc1c62f8410822d46d6e3152':
b/
2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE
Michael Chan [Mon, 11 Jan 2010 23:16:30 +0000 (15:16 -0800)]
am
d9d8ef26: Merge "b/
2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE" into eclair
Merge commit '
d9d8ef264d3a66e7be84908cf0f9d78713c42722' into eclair-plus-aosp
* commit '
d9d8ef264d3a66e7be84908cf0f9d78713c42722':
b/
2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE
Michael Chan [Mon, 11 Jan 2010 23:14:36 +0000 (15:14 -0800)]
Merge "b/
2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE" into eclair
Michael Chan [Mon, 4 Jan 2010 20:15:11 +0000 (12:15 -0800)]
b/
2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE
Change-Id: I02825cbde24ff0215787bb2d4f78cd6e7e1f4033
Michael Chan [Sat, 9 Jan 2010 02:14:38 +0000 (18:14 -0800)]
Merge "b/
2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state."
Michael Chan [Mon, 4 Jan 2010 20:15:11 +0000 (12:15 -0800)]
b/
2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state.
Change-Id: I4428708e02e7dcbb26795b0982cfe4389df60a46
Romain Guy [Fri, 8 Jan 2010 23:07:10 +0000 (15:07 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #
2361749.
Eric Fischer [Fri, 8 Jan 2010 21:11:18 +0000 (13:11 -0800)]
Merge "Change the "Brasilia" time zone to follow America/Sao_Paulo DST rules."
Eric Fischer [Fri, 8 Jan 2010 20:39:44 +0000 (12:39 -0800)]
Change the "Brasilia" time zone to follow America/Sao_Paulo DST rules.
Previously it was using America/Araguaina, which does not currently observe
DST. Brasilia is actually in an area that follows the Sao_Paulo rules.
Bug
2362824
Amith Yamasani [Fri, 8 Jan 2010 18:52:44 +0000 (10:52 -0800)]
Merge "Don't allow monkey to play with SIM lock settings. Bug #
2358489"
Amith Yamasani [Fri, 8 Jan 2010 03:05:07 +0000 (19:05 -0800)]
Don't allow monkey to play with SIM lock settings. Bug #
2358489
If the monkey is running, exit the SIM lock settings activity.
Eric Fischer [Fri, 8 Jan 2010 00:00:11 +0000 (16:00 -0800)]
Update with latest translations.
Irfan Sheriff [Thu, 7 Jan 2010 18:53:52 +0000 (10:53 -0800)]
Merge "Do a null check on setting an AP as configured"
San Mehat [Thu, 7 Jan 2010 05:41:47 +0000 (21:41 -0800)]
settings: Change unmount button to a mount/unmount toggle
Signed-off-by: San Mehat <san@google.com>
Irfan Sheriff [Thu, 7 Jan 2010 00:23:26 +0000 (16:23 -0800)]
Do a null check on setting an AP as configured
This was introduced when trying to fix bug
2296038. A null check is required on AP.
Bug:
2296038
Michael Chan [Wed, 6 Jan 2010 23:49:55 +0000 (15:49 -0800)]
am
d638a7cb: am
04e32ff3: Merge "b/
2335545 Revert the dock strings back to "For Music and Media"" into eclair
Merge commit '
d638a7cb0841184349edbec2c995a36e5719cb8c'
* commit '
d638a7cb0841184349edbec2c995a36e5719cb8c':
b/
2335545 Revert the dock strings back to "For Music and Media"
Michael Chan [Wed, 6 Jan 2010 23:47:57 +0000 (15:47 -0800)]
am
04e32ff3: Merge "b/
2335545 Revert the dock strings back to "For Music and Media"" into eclair
Merge commit '
04e32ff35fe60cdd62509cff1df24d62cd464f4e' into eclair-plus-aosp
* commit '
04e32ff35fe60cdd62509cff1df24d62cd464f4e':
b/
2335545 Revert the dock strings back to "For Music and Media"
Michael Chan [Wed, 6 Jan 2010 23:44:30 +0000 (15:44 -0800)]
Merge "b/
2335545 Revert the dock strings back to "For Music and Media"" into eclair