OSDN Git Service
Amith Yamasani [Sun, 30 Sep 2012 21:42:53 +0000 (14:42 -0700)]
am
2485d9fc: Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
* commit '
2485d9fc5113e7a886ae5b59e535905b0f210fa4':
Make Settings shortcuts launch into the correct activity/fragment.
Amith Yamasani [Sun, 30 Sep 2012 21:41:11 +0000 (14:41 -0700)]
Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
Amith Yamasani [Fri, 28 Sep 2012 23:40:42 +0000 (16:40 -0700)]
Make Settings shortcuts launch into the correct activity/fragment.
Bug:
6959454
Change the task affinities so that the shortcuts are not tied to
Settings main task.
Change-Id: I7729d17d8144a4a57f0d135fe80bdbd7af8dad01
Dianne Hackborn [Sat, 29 Sep 2012 01:22:27 +0000 (18:22 -0700)]
am
1a47ecd9: Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
* commit '
1a47ecd9269ff28bec71592b8c3d9a857ac49967':
Fix issue #
7255954: API Review: rename Dream to DreamService
Dianne Hackborn [Sat, 29 Sep 2012 01:18:21 +0000 (18:18 -0700)]
Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
Dianne Hackborn [Sat, 29 Sep 2012 01:02:15 +0000 (18:02 -0700)]
Fix issue #
7255954: API Review: rename Dream to DreamService
Change-Id: Ic374130cb37cbbfad0421089aecf30de87c4d369
Robert Greenwalt [Sat, 29 Sep 2012 00:09:56 +0000 (17:09 -0700)]
am
a59cc272: Merge "Colorize premium sms ui." into jb-mr1-dev
* commit '
a59cc2722e6dd3cdc50e27c9564d4da37c952cf6':
Colorize premium sms ui.
Svetoslav Ganov [Sat, 29 Sep 2012 00:06:43 +0000 (17:06 -0700)]
am
a59f1aac: Setting to enable the global gesture for turning on accessibility.
* commit '
a59f1aacc0b55a301ce8b36498f79c9f589c5f20':
Setting to enable the global gesture for turning on accessibility.
Robert Greenwalt [Fri, 28 Sep 2012 23:54:03 +0000 (16:54 -0700)]
Merge "Colorize premium sms ui." into jb-mr1-dev
Svetoslav Ganov [Thu, 27 Sep 2012 23:04:54 +0000 (16:04 -0700)]
Setting to enable the global gesture for turning on accessibility.
1. Adding a setting to enable the gesture to turn on accessibility.
This is a new screen with a toggle switch similarly as screen
magnification which will contain explanation of how to perform
the gesture.
bug:
6171929
Change-Id: I84dfa46a9b7b789d99923684e08e52cf7d236eb2
Russell Brenner [Fri, 28 Sep 2012 19:52:14 +0000 (12:52 -0700)]
am
88c9f288: Show warnings when skipping Wi-Fi connection
* commit '
88c9f2889fafb53a2875418317ecd197d9aae883':
Show warnings when skipping Wi-Fi connection
Russell Brenner [Thu, 27 Sep 2012 18:37:54 +0000 (11:37 -0700)]
Show warnings when skipping Wi-Fi connection
If user skips over Wi-Fi, warn about possible carrier data charges or
inability to receive updates, depending on whether or not phone
service is available.
Note to translators: Some strings are being moved here from setup
wizard. They're tagged with their msgid's so as not to trigger
retranslation.
Bug:
7211786
Change-Id: Idec7863377bd453d1808b26ee3da75f8310b32e0
Amith Yamasani [Fri, 28 Sep 2012 07:03:09 +0000 (00:03 -0700)]
am
990c5f24: Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev
* commit '
990c5f2432add56ce6a32cb7c40c4c8bff1e8e5c':
Bring up new user setup dialog when tapping on new user
Amith Yamasani [Fri, 28 Sep 2012 07:00:53 +0000 (00:00 -0700)]
Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev
Baligh Uddin [Fri, 28 Sep 2012 06:49:03 +0000 (23:49 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Fri, 28 Sep 2012 06:44:42 +0000 (23:44 -0700)]
am
ec4a1520: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
ec4a152071fb9e3dcdf00eec2444afc6df800540':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 06:41:51 +0000 (23:41 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 28 Sep 2012 06:40:16 +0000 (23:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc3aa0738b4f2beccdc05c1c225ff60308def5d4
Auto-generated-cl: translation import
Baligh Uddin [Fri, 28 Sep 2012 06:38:37 +0000 (23:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I38fbd0c22b6056e9c089425511481e6c4b1dacac
Auto-generated-cl: translation import
rich cannings [Fri, 28 Sep 2012 06:13:57 +0000 (23:13 -0700)]
am
4f64951c: Merge "Developer setting to skip Package Verification" into jb-mr1-dev
* commit '
4f64951cb89c5da82fdbba3c02bccf0f3500c2a7':
Developer setting to skip Package Verification
rich cannings [Fri, 28 Sep 2012 06:11:50 +0000 (23:11 -0700)]
Merge "Developer setting to skip Package Verification" into jb-mr1-dev
Amith Yamasani [Fri, 28 Sep 2012 06:01:35 +0000 (23:01 -0700)]
Bring up new user setup dialog when tapping on new user
Bug:
7245796
Also fix a few strings that changed and other UI tweaks to conform
to spec document.
Change-Id: If4409459b20ec8c8ece69b6c23c8ab49b0ca0cac
Jeff Sharkey [Fri, 28 Sep 2012 02:32:54 +0000 (19:32 -0700)]
am
cc24aa2b: Merge "Follow more Secure settings to Global." into jb-mr1-dev
* commit '
cc24aa2b1f58236867a4e0c326e5ce4197df55d8':
Follow more Secure settings to Global.
Jeff Sharkey [Fri, 28 Sep 2012 02:31:09 +0000 (19:31 -0700)]
Merge "Follow more Secure settings to Global." into jb-mr1-dev
Wink Saville [Fri, 28 Sep 2012 01:16:22 +0000 (18:16 -0700)]
am
b0873900: Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
* commit '
b08739003aa2cbc4dfe650f6badda8cfe2be1e76':
Fix an NPE in WifiSettings.
Wink Saville [Fri, 28 Sep 2012 01:14:45 +0000 (18:14 -0700)]
Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
rich cannings [Tue, 25 Sep 2012 23:20:36 +0000 (16:20 -0700)]
Developer setting to skip Package Verification
Add a developer setting to skip package verification when installing over
USB/ADB/ADT, but still perform package verification on all other installs.
This change also fixes visibility issues. Namely, now all "Verify apps"
related settings will disappear when
Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE is 0.
Bug:
7183252
Change-Id: I04cfc4f521d1ecb73df56b172cf29cbd84f53dad
Jeff Sharkey [Thu, 27 Sep 2012 05:08:16 +0000 (22:08 -0700)]
Follow more Secure settings to Global.
Bug:
7232014,
7231331,
7231198
Change-Id: Iea055cfa58edb253b55fe30bf294994ad338cfa4
Wink Saville [Thu, 27 Sep 2012 23:16:15 +0000 (16:16 -0700)]
Fix an NPE in WifiSettings.
Under stressful conditions, like the Monkey tests, getActivity() can
return null. We assume this occurs when the fragment has shut down but
asynchronous commands are returning results. This change adds appropriate
null checks but assumes during normal operation the checks are not needed.
Bug:
7152711
Change-Id: I7a3736ccead33738dab1a36e78ae1d8042db6e94
Amith Yamasani [Thu, 27 Sep 2012 23:08:54 +0000 (16:08 -0700)]
am
48af3cdb: Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
* commit '
48af3cdbd934b79ebbcd4639bb63621e93ca9ec2':
Rename "Owner info" to "User info" for secondary users
Amith Yamasani [Thu, 27 Sep 2012 23:06:48 +0000 (16:06 -0700)]
Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
Russell Brenner [Thu, 27 Sep 2012 22:17:07 +0000 (15:17 -0700)]
am
2c84b9f2: Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
* commit '
2c84b9f23c1bf345478bce7a2955ac309e32fe6d':
Move super call to top of onActivityCreated
Russell Brenner [Thu, 27 Sep 2012 22:14:26 +0000 (15:14 -0700)]
Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
Amith Yamasani [Thu, 27 Sep 2012 21:50:13 +0000 (14:50 -0700)]
Rename "Owner info" to "User info" for secondary users
Bug:
7237781
Change-Id: I40207d6aa34bf3b7403f077fc7f3a945d739269d
Adam Cohen [Thu, 27 Sep 2012 20:16:59 +0000 (13:16 -0700)]
am
f4b6a682: Merge "Addressing issue
7243210, can\'t set status widget properly" into jb-mr1-dev
* commit '
f4b6a68215a0269837b73f134ff57cf150bc1d9c':
Addressing issue
7243210, can't set status widget properly
Adam Cohen [Thu, 27 Sep 2012 20:14:17 +0000 (13:14 -0700)]
Merge "Addressing issue
7243210, can't set status widget properly" into jb-mr1-dev
Robert Greenwalt [Thu, 27 Sep 2012 20:12:07 +0000 (13:12 -0700)]
am
fffc9bef: Merge "Precreate a data structure so it\'s never null." into jb-mr1-dev
* commit '
fffc9bef49428ac4974ed5c1ee2e4d0c0f9d4a5a':
Precreate a data structure so it's never null.
Robert Greenwalt [Thu, 27 Sep 2012 20:10:44 +0000 (13:10 -0700)]
Merge "Precreate a data structure so it's never null." into jb-mr1-dev
Adam Cohen [Thu, 27 Sep 2012 20:04:00 +0000 (13:04 -0700)]
Addressing issue
7243210, can't set status widget properly
Change-Id: I863136bbef123f1c13d9e887840ca48ac7ccbf95
Robert Greenwalt [Thu, 27 Sep 2012 18:21:12 +0000 (11:21 -0700)]
Precreate a data structure so it's never null.
Fixes NPE that the fast-fingered monkey sometimes triggers.
bug:
7084178
Change-Id: Ibeb5e1ce678f59207de5dd321e06ae88ccc52216
Baligh Uddin [Thu, 27 Sep 2012 17:09:06 +0000 (10:09 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Thu, 27 Sep 2012 17:06:09 +0000 (10:06 -0700)]
am
bfb5fa9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
bfb5fa9ec37d58101febd13a334707f8f7e341f5':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Sep 2012 17:03:48 +0000 (10:03 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Amith Yamasani [Thu, 27 Sep 2012 05:03:10 +0000 (22:03 -0700)]
am
04c4ec60: Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev
* commit '
04c4ec607affecc16e3032327288f890bddad3db':
Show warning dialog in a multiuser system when adding a new account.
Amith Yamasani [Thu, 27 Sep 2012 05:01:18 +0000 (22:01 -0700)]
Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev
Jeff Sharkey [Thu, 27 Sep 2012 03:17:19 +0000 (20:17 -0700)]
am
3db14139: Merge "Clean up Global settings stragglers." into jb-mr1-dev
* commit '
3db14139205d762ccf544c20ee2b4a04dd4de0da':
Clean up Global settings stragglers.
Jeff Sharkey [Thu, 27 Sep 2012 03:15:19 +0000 (20:15 -0700)]
Merge "Clean up Global settings stragglers." into jb-mr1-dev
Baligh Uddin [Thu, 27 Sep 2012 01:51:25 +0000 (18:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibdc7730e6559d27b4c9abd2e3cec90f2a0d97a76
Auto-generated-cl: translation import
Baligh Uddin [Thu, 27 Sep 2012 01:49:52 +0000 (18:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9380681436e70cd7e9680b32f5e82974cc35bd7a
Auto-generated-cl: translation import
Amith Yamasani [Thu, 27 Sep 2012 00:57:15 +0000 (17:57 -0700)]
Show warning dialog in a multiuser system when adding a new account.
Bug:
7207092
Change-Id: I95ac107dbc867490dd2e492291501fd3630d267c
Jeff Brown [Thu, 27 Sep 2012 00:28:54 +0000 (17:28 -0700)]
am
74c1d328: Avoid using hardcoded strings.
* commit '
74c1d328e2e75265a2b106ef66618cf1eb60c914':
Avoid using hardcoded strings.
Jeff Sharkey [Thu, 27 Sep 2012 00:11:43 +0000 (17:11 -0700)]
Clean up Global settings stragglers.
Bug:
7242121
Change-Id: Ibe62c70f88c946e46a0604a6999b5ca18ac18a1e
Jeff Brown [Wed, 26 Sep 2012 20:36:53 +0000 (13:36 -0700)]
Avoid using hardcoded strings.
Bug:
7204211
Change-Id: Ida5f93719aad472964386f3591518547ddf32f94
Chris Wren [Wed, 26 Sep 2012 20:20:00 +0000 (13:20 -0700)]
am
99f98bb1: Merge "show the dream enable switch in all conditions." into jb-mr1-dev
* commit '
99f98bb14607240a0e05997a18770912ade1587e':
show the dream enable switch in all conditions.
Chris Wren [Wed, 26 Sep 2012 20:18:01 +0000 (13:18 -0700)]
Merge "show the dream enable switch in all conditions." into jb-mr1-dev
Chris Wren [Wed, 26 Sep 2012 18:39:05 +0000 (14:39 -0400)]
show the dream enable switch in all conditions.
Bug:
7229905
Change-Id: I3fc3b2e8ce1e8bb08c72daed9c5d33ce5ff343c6
Amith Yamasani [Wed, 26 Sep 2012 18:49:15 +0000 (11:49 -0700)]
am
6f2ca5bc: Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev
* commit '
6f2ca5bc71d9afc531b60762b8676cacdb96fcaa':
Show more security settings, and fix missing summary in widget selection.
Amith Yamasani [Wed, 26 Sep 2012 18:47:32 +0000 (11:47 -0700)]
Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev
John Spurlock [Wed, 26 Sep 2012 18:19:37 +0000 (11:19 -0700)]
am
d33caa4d: Dream settings now looks for the settings activity in xml.
* commit '
d33caa4dea521677431f86e719ac1df290a24c69':
Dream settings now looks for the settings activity in xml.
John Spurlock [Wed, 26 Sep 2012 16:40:54 +0000 (12:40 -0400)]
Dream settings now looks for the settings activity in xml.
Uses the new api for obtaining dream metadata, no longer looks
for the settings activity using the old metadata key.
Bug:
7172816
Change-Id: I5f9f9ea2a59df6a55c2f17bca5cdbe206f89d780
John Spurlock [Wed, 26 Sep 2012 15:25:28 +0000 (08:25 -0700)]
am
49dc9825: Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
* commit '
49dc9825569d0c555466303d7d78f1bc75e1602b':
Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
John Spurlock [Wed, 26 Sep 2012 15:16:34 +0000 (11:16 -0400)]
Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
This is to avoid even a temporary build breakage. Using the new
xml file will be done in a followup commit.
Bug:
7172816
Change-Id: If6fedefbee38428eda5b39994c3ad8ff86c8fef9
Amith Yamasani [Wed, 26 Sep 2012 05:17:33 +0000 (22:17 -0700)]
Show more security settings, and fix missing summary in widget selection.
Bug:
7232809
Change-Id: Ib7a67b83f455592ba5e0e48420924671f8ed95e8
Baligh Uddin [Wed, 26 Sep 2012 04:14:20 +0000 (21:14 -0700)]
am
bf7fe20d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
bf7fe20d5b66e30523a3ba7c84a69350709644d5':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 26 Sep 2012 04:13:15 +0000 (21:13 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Wed, 26 Sep 2012 04:12:29 +0000 (21:12 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Svetoslav Ganov [Wed, 26 Sep 2012 01:19:28 +0000 (18:19 -0700)]
am
12fda43f: Merge "Show long message for a new user only once." into jb-mr1-dev
* commit '
12fda43f8564968cc93d0f8b5839fd520d33577d':
Show long message for a new user only once.
Svetoslav Ganov [Wed, 26 Sep 2012 01:17:15 +0000 (18:17 -0700)]
Merge "Show long message for a new user only once." into jb-mr1-dev
Amith Yamasani [Wed, 26 Sep 2012 00:21:21 +0000 (17:21 -0700)]
am
0d9179c4: Merge "You section title for current user details" into jb-mr1-dev
* commit '
0d9179c47338532bb2995130d07e458ab12bcb5c':
You section title for current user details
Amith Yamasani [Wed, 26 Sep 2012 00:18:21 +0000 (17:18 -0700)]
Merge "You section title for current user details" into jb-mr1-dev
Jeff Brown [Wed, 26 Sep 2012 00:05:59 +0000 (17:05 -0700)]
am
209898da: Merge "Update references to migrated global settings." into jb-mr1-dev
* commit '
209898da754a0455864a9251723cb3ab91f36e46':
Update references to migrated global settings.
Jeff Brown [Wed, 26 Sep 2012 00:05:50 +0000 (17:05 -0700)]
am
6a5e32a6: Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev
* commit '
6a5e32a658ac62e72092e3b5d8fb3b99cc4b5158':
Move OVERLAY_DISPLAY_DEVICES to Global.
Jeff Brown [Wed, 26 Sep 2012 00:03:21 +0000 (17:03 -0700)]
Merge "Update references to migrated global settings." into jb-mr1-dev
Jeff Brown [Wed, 26 Sep 2012 00:03:16 +0000 (17:03 -0700)]
Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev
Jeff Brown [Tue, 25 Sep 2012 23:30:07 +0000 (16:30 -0700)]
am
cd207ad4: Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
* commit '
cd207ad437085fe3757259bd708fe74f68179094':
Fix regression in Bluetooth settings.
Jeff Brown [Tue, 25 Sep 2012 23:24:59 +0000 (16:24 -0700)]
Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
Svetoslav Ganov [Tue, 25 Sep 2012 23:11:16 +0000 (16:11 -0700)]
Show long message for a new user only once.
1. We show a longer message only for the first added user. The
longer message will be shown until the user has been created,
which is until the creator pokes the OK button in the create
new user dialog.
bug:
7210780
Change-Id: Ifed4899048a8369f41f145af204a1e4e860f9b4c
Baligh Uddin [Tue, 25 Sep 2012 23:09:15 +0000 (16:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic76cd17011c6da46ba5298eb2d1f081f7dc6f633
Auto-generated-cl: translation import
Baligh Uddin [Tue, 25 Sep 2012 23:07:01 +0000 (16:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied12646ca5b4a822a07db7f09b6036a165d549fe
Auto-generated-cl: translation import
Amith Yamasani [Tue, 25 Sep 2012 22:47:08 +0000 (15:47 -0700)]
You section title for current user details
Bug:
7232244
Change-Id: I04904f423f236b4dcfc2e1c61618eb88b80b593c
Jeff Brown [Tue, 25 Sep 2012 22:01:02 +0000 (15:01 -0700)]
Update references to migrated global settings.
Bug:
7231172
Change-Id: Ia4abbb6f897e93ebe38e6536fac7411b96eb2bb5
Jeff Brown [Tue, 25 Sep 2012 22:21:40 +0000 (15:21 -0700)]
Move OVERLAY_DISPLAY_DEVICES to Global.
Bug:
7127417
Change-Id: I9ed62e98754eba8a6107a5cac00f00f83904852d
Michael Jurka [Tue, 25 Sep 2012 21:35:15 +0000 (14:35 -0700)]
am
16398c9c: UI refinements to security screen widgets interface
* commit '
16398c9c973ba16a14455c4eee9ca162e0273792':
UI refinements to security screen widgets interface
Robert Greenwalt [Tue, 25 Sep 2012 18:37:26 +0000 (11:37 -0700)]
Colorize premium sms ui.
bug:
7205024
Change-Id: I1d32515d0822f5c96013708f26422d4700f7490b
Michael Jurka [Tue, 25 Sep 2012 00:30:17 +0000 (17:30 -0700)]
UI refinements to security screen widgets interface
Bug #
7158868
Change-Id: Ia5be3986323119ea78b9e486b4d2e6e81bf145e7
Jeff Brown [Tue, 25 Sep 2012 03:33:51 +0000 (20:33 -0700)]
Fix regression in Bluetooth settings.
Bug:
7207090
Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
Chris Wren [Mon, 24 Sep 2012 21:39:06 +0000 (14:39 -0700)]
am
8bea3c3f: Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev
* commit '
8bea3c3fb8b3ecbb33fbd5b159faaa7d229e7cf1':
move remaining dock settings into sound settings fragment.
Chris Wren [Mon, 24 Sep 2012 21:37:23 +0000 (14:37 -0700)]
Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev
Adam Cohen [Mon, 24 Sep 2012 21:10:57 +0000 (14:10 -0700)]
am
85d4b5f7: Ensuring that keyguard widgets are bound with correct options
* commit '
85d4b5f78e831fdfe6da39f6edafd32c7d63dfea':
Ensuring that keyguard widgets are bound with correct options
Jeff Sharkey [Mon, 24 Sep 2012 21:00:01 +0000 (14:00 -0700)]
am
ff571fee: Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev
* commit '
ff571fee86267348e852a07826ffc78cc43384ba':
Hide lockdown VPN when IMS auth is required.
Adam Cohen [Mon, 24 Sep 2012 20:15:14 +0000 (13:15 -0700)]
Ensuring that keyguard widgets are bound with correct options
-> We need to bind the widget and indicate that it is a keyguard widget
Change-Id: I8e76b45b86aecc671669022c6f5fad071b62837d
Jeff Sharkey [Mon, 24 Sep 2012 20:08:56 +0000 (13:08 -0700)]
Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev
Chris Wren [Mon, 24 Sep 2012 18:23:46 +0000 (14:23 -0400)]
move remaining dock settings into sound settings fragment.
Bug:
7016769
Change-Id: I21a7bf6140f7470dbb9bebeda1ebcc3f17c481c6
Jeff Sharkey [Mon, 24 Sep 2012 19:56:29 +0000 (12:56 -0700)]
Hide lockdown VPN when IMS auth is required.
Bug:
7069782
Change-Id: I978d89894da17164a1e0122adb5acbfda3586fa1
Adam Cohen [Mon, 24 Sep 2012 18:51:31 +0000 (11:51 -0700)]
am
c939735b: Merge "Addressing issue where power control widget disappears issue
7205586" into jb-mr1-dev
* commit '
c939735b176a3a401e8a3e60e9fd8a6a732a2dc0':
Addressing issue where power control widget disappears issue
7205586
Adam Cohen [Mon, 24 Sep 2012 18:49:23 +0000 (11:49 -0700)]
Merge "Addressing issue where power control widget disappears issue
7205586" into jb-mr1-dev
Amith Yamasani [Mon, 24 Sep 2012 15:32:09 +0000 (08:32 -0700)]
am
7fb91855: Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
* commit '
7fb91855b05b312e45bfded72d48e0cffcee4a44':
Show more settings and add restrictions/dialogs for secondary users
Jeff Sharkey [Mon, 24 Sep 2012 15:32:08 +0000 (08:32 -0700)]
am
0e9cf8a7: Storage item to represent cached data.
* commit '
0e9cf8a723c3e03207e905e8e03303ec4b5526dc':
Storage item to represent cached data.
Baligh Uddin [Mon, 24 Sep 2012 15:32:07 +0000 (08:32 -0700)]
am
b1055311: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
b105531116148d5d29e113e611ac180aa9691c6e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 24 Sep 2012 15:32:06 +0000 (08:32 -0700)]
am
17b7a8cd: Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
* commit '
17b7a8cd1895871441c86afef5387acfa3b81b57':
Remove no longer used dream_settings.xml.