OSDN Git Service
Lifu Tang [Tue, 3 Sep 2013 17:01:56 +0000 (17:01 +0000)]
Merge "Creates Sipper even the consumption is very little" into klp-dev
Lifu Tang [Tue, 3 Sep 2013 17:01:33 +0000 (17:01 +0000)]
Merge "Shows correct state when location sharing disabled" into klp-dev
Amith Yamasani [Tue, 3 Sep 2013 15:57:24 +0000 (15:57 +0000)]
Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev
Lifu Tang [Sat, 31 Aug 2013 01:03:43 +0000 (18:03 -0700)]
Creates Sipper even the consumption is very little
Change-Id: I9682f262a481f3586760b8464b96eeb22814a840
Wink Saville [Sat, 31 Aug 2013 00:26:19 +0000 (17:26 -0700)]
am
d5c71fc4: am
e38165ca: am
7bee4c29: Use correct action string for provisioning.
* commit '
d5c71fc4e613d80d1ff8c128f29d9c201bcb3f90':
Use correct action string for provisioning.
Lifu Tang [Fri, 30 Aug 2013 01:06:30 +0000 (18:06 -0700)]
Shows correct state when location sharing disabled
- Fix b/
10553306
Change-Id: I01f69aaeb79e18ddf29da5aef7ea00938e674429
Amith Yamasani [Fri, 30 Aug 2013 22:43:44 +0000 (15:43 -0700)]
Add a missing fragment to list of valid ones for top-level settings
Bug:
10552817
Change-Id: I1ea80de565d1ec58da834cdd67dab0cb71e635b7
Alan Viverette [Fri, 30 Aug 2013 21:35:04 +0000 (21:35 +0000)]
Merge "Update captioning settings to match revised API" into klp-dev
Maggie Benthall [Fri, 30 Aug 2013 13:54:28 +0000 (13:54 +0000)]
Merge "Fixes for pin-restricted settings." into klp-dev
Wink Saville [Fri, 30 Aug 2013 03:42:59 +0000 (20:42 -0700)]
am
e38165ca: am
7bee4c29: Use correct action string for provisioning.
* commit '
e38165caf08a164999b9518dd1f16c9f94d581e9':
Use correct action string for provisioning.
Wink Saville [Fri, 30 Aug 2013 03:41:04 +0000 (20:41 -0700)]
am
7bee4c29: Use correct action string for provisioning.
* commit '
7bee4c294204be49edf58e9251726425ffcc5748':
Use correct action string for provisioning.
Wink Saville [Fri, 30 Aug 2013 02:58:09 +0000 (19:58 -0700)]
Use correct action string for provisioning.
Change to use the correct action string
com.adnroid.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK
Bug:
10551510
Change-Id: I917de4fcde06b72f520dec38e42c50859b2ee098
Lifu Tang [Thu, 29 Aug 2013 23:43:59 +0000 (23:43 +0000)]
Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev
Wink Saville [Thu, 29 Aug 2013 22:15:53 +0000 (15:15 -0700)]
am
1bc2db22: am
0e042a44: am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
1bc2db2221f6cdb92cce5d40f9eb940fe0ed4914':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 22:11:11 +0000 (22:11 +0000)]
Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into klp-dev
Maggie Benthall [Thu, 29 Aug 2013 14:49:13 +0000 (10:49 -0400)]
Fixes for pin-restricted settings.
- Reprompt for pin after screen has been locked and unlocked.
- For protected preferences, store the Preference and continue if pin entry is successful.
- Protect whole UserSettings and DevelopmentSettings pages.
Bug:
10543207
Change-Id: If1d4b31ca94a8cfc103625b74385bcd0bdd3d88b
Lifu Tang [Thu, 29 Aug 2013 21:42:12 +0000 (14:42 -0700)]
Replaced ContentQueryMap with CursorLoader
- Piggyback a trivial typo fix from previous change
- Fix b/
10228666
Change-Id: I96c4f5c434b67caf10b3406eec4f3f7c5cf846e9
Tom O'Neill [Thu, 29 Aug 2013 21:22:54 +0000 (21:22 +0000)]
Merge "Make sure we've finished loading settings before processing any reloads" into klp-dev
Wink Saville [Wed, 28 Aug 2013 21:26:27 +0000 (14:26 -0700)]
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Bug:
10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Martijn Coenen [Thu, 29 Aug 2013 21:01:16 +0000 (21:01 +0000)]
Merge "Update NFC payments to match new framework APIs." into klp-dev
Wink Saville [Thu, 29 Aug 2013 18:57:48 +0000 (11:57 -0700)]
am
0e042a44: am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
0e042a44a8ee0e26d92be8d73d7ed297b4beab37':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Lifu Tang [Thu, 29 Aug 2013 18:31:27 +0000 (18:31 +0000)]
Merge "Fixed the widget location toggle button" into klp-dev
Tom O'Neill [Thu, 29 Aug 2013 17:48:13 +0000 (10:48 -0700)]
Make sure we've finished loading settings before processing any reloads
- Effectively throttles case where many reloads are sent in rapid
succession.
- Simplify Handler state machine by making the state explicit instead
of implicit in the sequence of messages.
- To guard against cascading timeouts due to RAM pressure or other
systemic issues, only start additional services if there is at most one
timed out setting at a time.
- Add some log messages
- Fix b/
10487253
Change-Id: Ibe21533f7b644bbadf5b56b61ca0e28b49192470
Wink Saville [Thu, 29 Aug 2013 17:23:04 +0000 (10:23 -0700)]
am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
289c2f0d3013f423849a9485b3044f0a1fc8dd92':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 17:20:24 +0000 (17:20 +0000)]
Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
Baligh Uddin [Thu, 29 Aug 2013 14:59:30 +0000 (07:59 -0700)]
am
f7b5ad80: (-s ours) am
da7395d6: (-s ours) am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
f7b5ad80a8e31d717ffed1a0b7a1403c3bf75cd1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:57:04 +0000 (07:57 -0700)]
am
da7395d6: (-s ours) am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
da7395d6c5a92738c2e7130590f30a536ec94b54':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:56:04 +0000 (07:56 -0700)]
am
439b1543: (-s ours) am
17d0af91: (-s ours) Import translations. DO NOT MERGE
* commit '
439b1543119fd97d134c602d92fc6ce9a517be20':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:53:56 +0000 (07:53 -0700)]
am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
c79028454106f4e73702c4bd4dde36a37beca90c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:53:47 +0000 (07:53 -0700)]
am
17d0af91: (-s ours) Import translations. DO NOT MERGE
* commit '
17d0af9160697f0fcb2d33ed4b4e91ad6769141c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:50:25 +0000 (14:50 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 06:36:55 +0000 (23:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I778a192cc22364fde11327c0e5e0d92dce6ef965
Auto-generated-cl: translation import
Baligh Uddin [Thu, 29 Aug 2013 06:33:19 +0000 (23:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2373253c983b6298e17d38882fc85ada1fd2e6e2
Auto-generated-cl: translation import
Baligh Uddin [Thu, 29 Aug 2013 06:32:03 +0000 (23:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7e0a050642f956f175dcb349945089b4515c1bb5
Auto-generated-cl: translation import
Martijn Coenen [Thu, 29 Aug 2013 02:28:17 +0000 (19:28 -0700)]
Update NFC payments to match new framework APIs.
Bug:
10262585
Change-Id: Id4167db50f8e5fe145441bdf73d151a61a8587ed
Amith Yamasani [Thu, 29 Aug 2013 01:04:10 +0000 (01:04 +0000)]
Merge "Fix RTL layout of text in Battery history screen" into klp-dev
Lifu Tang [Wed, 28 Aug 2013 22:55:49 +0000 (15:55 -0700)]
Fixed the widget location toggle button
- Fix b/
10531669
Change-Id: Iba08d515119c42e5c4de4ee02d6dd8aea404fc69
Lifu Tang [Wed, 28 Aug 2013 22:29:54 +0000 (22:29 +0000)]
Merge "Disallows setting when user restriction applies" into klp-dev
Amith Yamasani [Wed, 28 Aug 2013 21:15:52 +0000 (14:15 -0700)]
Fix RTL layout of text in Battery history screen
Change the anchor position and alignment direction for text.
Bug:
10447666
Change-Id: Ida4161c738cf9a32cc8ff98037f3755046e64e33
Amith Yamasani [Wed, 28 Aug 2013 21:52:59 +0000 (21:52 +0000)]
Merge "Add more fragments to valid list for Wifi activity" into klp-dev
Wink Saville [Wed, 28 Aug 2013 21:26:27 +0000 (14:26 -0700)]
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Bug:
10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Lifu Tang [Wed, 28 Aug 2013 00:09:55 +0000 (17:09 -0700)]
Disallows setting when user restriction applies
- Fix b/
10116533
Change-Id: Ib171f9545c1651fb36c408decefa47b3d82ba3ab
Amith Yamasani [Wed, 28 Aug 2013 19:38:46 +0000 (12:38 -0700)]
Add more fragments to valid list for Wifi activity
Bug:
10508371
Change-Id: Ic2d2128433ae26ea6750281b978781cb56b97036
Baligh Uddin [Wed, 28 Aug 2013 02:42:22 +0000 (19:42 -0700)]
am
d866be38: (-s ours) am
1caeb5a1: (-s ours) am
d8c9c146: (-s ours) Import translations. DO NOT MERGE
* commit '
d866be382b330ae6c96dfe0de66f2426945b7730':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:40:21 +0000 (19:40 -0700)]
am
1caeb5a1: (-s ours) am
d8c9c146: (-s ours) Import translations. DO NOT MERGE
* commit '
1caeb5a11d4846c5db9741c914b1ba53b0af6dc9':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:39:03 +0000 (19:39 -0700)]
am
56fc8b77: (-s ours) am
04a25289: (-s ours) Import translations. DO NOT MERGE
* commit '
56fc8b77643411ca8c43b0f3d178c3804de7093b':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:37:03 +0000 (19:37 -0700)]
am
04a25289: (-s ours) Import translations. DO NOT MERGE
* commit '
04a252899bdd8a798d1a9c90c2ab45f9efdba5a8':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:36:48 +0000 (19:36 -0700)]
am
d8c9c146: (-s ours) Import translations. DO NOT MERGE
* commit '
d8c9c146e79636f44808e2514e666f0966cc5596':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:34:24 +0000 (02:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Maggie Benthall [Wed, 28 Aug 2013 00:00:00 +0000 (00:00 +0000)]
Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev
Amith Yamasani [Tue, 27 Aug 2013 21:42:57 +0000 (21:42 +0000)]
Merge "Don't list apps that are disabled by the system" into klp-dev
Alan Viverette [Tue, 27 Aug 2013 18:11:00 +0000 (11:11 -0700)]
Update captioning settings to match revised API
BUG:
10461210
Change-Id: I44d1fdeaead4357ff2591db6d9dda1c8a231103c
Tom O'Neill [Tue, 27 Aug 2013 15:48:34 +0000 (15:48 +0000)]
Merge "Switch to new location mode API recommended by API council" into klp-dev
Tom O'Neill [Tue, 27 Aug 2013 14:38:07 +0000 (14:38 +0000)]
Merge "Adapt to SettingsInjectorService API changes" into klp-dev
Tom O'Neill [Mon, 26 Aug 2013 21:40:54 +0000 (14:40 -0700)]
Switch to new location mode API recommended by API council
- Part of b/
10461763 fix
Change-Id: I202ce4c817f24a1682796e92fed9cc3efcc31a81
Baligh Uddin [Mon, 26 Aug 2013 20:59:51 +0000 (13:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibf7604d13d020201dd350b35765da372c2f9fbbb
Auto-generated-cl: translation import
Baligh Uddin [Mon, 26 Aug 2013 20:55:54 +0000 (13:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I46db6a6657e5528bbb4a84187f9b271baf644843
Auto-generated-cl: translation import
Baligh Uddin [Mon, 26 Aug 2013 20:54:28 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iddf40541878ef237a1890dad5c3d16e4132d6dde
Auto-generated-cl: translation import
Alan Viverette [Mon, 26 Aug 2013 20:25:59 +0000 (13:25 -0700)]
Fix APN preference style
BUG:
10445477
Change-Id: Ie1ce786ce49e1b68ffd38f6908189b8241773838
Tom O'Neill [Mon, 26 Aug 2013 16:47:55 +0000 (09:47 -0700)]
Adapt to SettingsInjectorService API changes
- Part of fix for b/
10461474
Change-Id: Ia37f444afc822a42ec21ebd2beae7aef8642547a
Tom O'Neill [Mon, 26 Aug 2013 14:33:37 +0000 (14:33 +0000)]
Merge "Handle races caused by rapid settings changed broadcasts" into klp-dev
Jim Miller [Sat, 24 Aug 2013 01:28:39 +0000 (01:28 +0000)]
Merge "Add setting to disable keyguard widgets" into klp-dev
Amith Yamasani [Sat, 24 Aug 2013 01:23:06 +0000 (01:23 +0000)]
Merge "Fix incorrect comparison" into klp-dev
Amith Yamasani [Sat, 24 Aug 2013 01:07:30 +0000 (18:07 -0700)]
Fix incorrect comparison
Bug:
10446469
Screen lock options should have been locked down when encryption is
enabled. An incorrect comparison (== instead of equals) caused it
to always bypass encryption quality check.
Change-Id: I7f3856146181a92183555f30bbc50d58bfe0c3d5
Lifu Tang [Sat, 24 Aug 2013 00:00:34 +0000 (00:00 +0000)]
Merge "Allows multi-line message on small-screen devices" into klp-dev
Chong Zhang [Fri, 23 Aug 2013 23:19:18 +0000 (23:19 +0000)]
Merge "wifi-display: add certification options" into klp-dev
Lifu Tang [Fri, 23 Aug 2013 22:18:38 +0000 (15:18 -0700)]
Allows multi-line message on small-screen devices
Change-Id: Ief7e152165059cea165f1271ab27a8a42537db8f
Tom O'Neill [Fri, 23 Aug 2013 22:23:12 +0000 (15:23 -0700)]
Handle races caused by rapid settings changed broadcasts
- Fix b/
10447517
Change-Id: I63ef98c9023cee1a15be61b966aed06dc35e9bd5
Baligh Uddin [Fri, 23 Aug 2013 17:21:09 +0000 (10:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1680219b7f4f2e9d71bb901d7708ef6eb153cfb6
Auto-generated-cl: translation import
Chong Zhang [Thu, 6 Jun 2013 19:42:24 +0000 (12:42 -0700)]
wifi-display: add certification options
- Checkbox to show certification menu in "Developer options"
- Certification menu to Wireless Display Settings, providing
misc control options required to certify
Bug:
9371882
Change-Id: Icf74d1122a9dc813b2cf95b6606a8a600a6b9cd1
Lifu Tang [Fri, 23 Aug 2013 00:43:19 +0000 (17:43 -0700)]
Reloads status messages for injected items
Change-Id: I6bb95c4b7ff4118074fb51aeed31596eab1e7eef
Lifu Tang [Thu, 22 Aug 2013 21:46:34 +0000 (21:46 +0000)]
Merge "Minor UI tweakings" into klp-dev
Lifu Tang [Thu, 22 Aug 2013 02:31:15 +0000 (19:31 -0700)]
Minor UI tweakings
* Changed PreferenceScreen to Preference.
* Adjusted the "No recent app" message layout.
* No "Location services" category when empty.
* Removed "Under Construction" finally, hooray!
Change-Id: I83fd1d7a1b0235ad21b3a5c54542e937b60b3940
Amith Yamasani [Thu, 22 Aug 2013 18:06:59 +0000 (18:06 +0000)]
Merge "Fix custom restrictions launch mechanism" into klp-dev
Baligh Uddin [Thu, 22 Aug 2013 18:02:26 +0000 (11:02 -0700)]
am
06de3680: (-s ours) am
56c597c1: (-s ours) am
bf65bf49: (-s ours) Import translations. DO NOT MERGE
* commit '
06de3680673eef2ac62dd4e17bb5ce118e88d5aa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:59:08 +0000 (10:59 -0700)]
am
f3381a80: (-s ours) am
f23da91e: (-s ours) Import translations. DO NOT MERGE
* commit '
f3381a80bd97af42c17bbcc5470804b5c6ada191':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:59:01 +0000 (10:59 -0700)]
am
56c597c1: (-s ours) am
bf65bf49: (-s ours) Import translations. DO NOT MERGE
* commit '
56c597c1b3c5a7d7d2f4e6e26c76c77b9e36120e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:55:45 +0000 (10:55 -0700)]
am
bf65bf49: (-s ours) Import translations. DO NOT MERGE
* commit '
bf65bf49cba2addbcfef81dcea87b27593b9e083':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:55:44 +0000 (10:55 -0700)]
am
f23da91e: (-s ours) Import translations. DO NOT MERGE
* commit '
f23da91e52169b920fb21a10ff76d617117d5f95':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:52:33 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Jonathan Dixon [Thu, 22 Aug 2013 05:00:20 +0000 (05:00 +0000)]
Merge "Add an Are you Sure to experiemental webview" into klp-dev
David Christie [Thu, 22 Aug 2013 04:14:56 +0000 (04:14 +0000)]
Merge "Update power widget to represent gps instead of location " into klp-dev
Jonathan Dixon [Thu, 22 Aug 2013 00:21:27 +0000 (17:21 -0700)]
Add an Are you Sure to experiemental webview
Bug:
10427705
Not bothering to translate strings as this will be deleted soon
Change-Id: I26721e606649d267d1b6507bc1a16ce91a63276a
David Christie [Thu, 22 Aug 2013 00:18:51 +0000 (17:18 -0700)]
Update power widget to represent gps instead of location
Change-Id: I62f701b612db2e31f9ad8b016dbf37ed7fd4ef26
Lifu Tang [Wed, 21 Aug 2013 02:40:44 +0000 (19:40 -0700)]
Sort "Location services" alphabetically
* Sort "Location services" items by title
* Throttle the rate of loading status messages
Change-Id: Iecb039a4ab94a810e11ef3e426e4a4b5c8c75c37
Baligh Uddin [Wed, 21 Aug 2013 23:08:45 +0000 (16:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f4834979c234fd3a3b2238bc4e3e5da68d033db
Auto-generated-cl: translation import
Baligh Uddin [Wed, 21 Aug 2013 23:04:35 +0000 (16:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iac08e7012b0da2da09077d0eaeda93b42473d14f
Auto-generated-cl: translation import
Baligh Uddin [Wed, 21 Aug 2013 23:03:04 +0000 (16:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idc054aa50da72b31b8c75270bff2739ef541af01
Auto-generated-cl: translation import
Alan Viverette [Wed, 21 Aug 2013 20:58:07 +0000 (13:58 -0700)]
Update caption preferences to use SubtitleView
Change-Id: I02230669c5e7be36006e04bb7110446265f122d9
Romain Guy [Wed, 21 Aug 2013 18:54:29 +0000 (11:54 -0700)]
Add Deuteranomaly color set to overdraw debugging
Change-Id: I27e48f54653f24383ab85c0e500fdd79cec28cc3
David Christie [Wed, 21 Aug 2013 17:40:56 +0000 (17:40 +0000)]
Merge "Switch location Settings and Power widget to use new Settings api." into klp-dev
Tom O'Neill [Wed, 21 Aug 2013 14:53:18 +0000 (14:53 +0000)]
Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev
Jim Miller [Wed, 21 Aug 2013 02:03:30 +0000 (19:03 -0700)]
Add setting to disable keyguard widgets
This allows disabling keyguard widgets through Settings.
On new devices, the setting is turned off by default. If the
user currently has widgets in keyguard, then we keep them
and re-enable the setting.
Change-Id: I25f0756ac72227e13dcb491694b3ec3c2bf1d293
Alan Viverette [Wed, 21 Aug 2013 01:14:33 +0000 (18:14 -0700)]
Allow the framework to recycle ApnPreference views
BUG:
10079104
Change-Id: Iaa4f155da12a141f16300076cc820d47e0c5779a
Alan Viverette [Tue, 20 Aug 2013 23:46:20 +0000 (23:46 +0000)]
Merge "Fix background and line wrapping in CaptionTextView" into klp-dev
Amith Yamasani [Tue, 20 Aug 2013 23:26:48 +0000 (16:26 -0700)]
Fix custom restrictions launch mechanism
Instead of showing a separate entry for launching custom restrictions,
launch it directly when clicking on the settings icon.
Bug:
10388399
Change-Id: I327d6d4c2b9840ce5ba140746568c5561a1a8936
Alan Viverette [Tue, 20 Aug 2013 22:58:38 +0000 (15:58 -0700)]
Fix background and line wrapping in CaptionTextView
Also fixes where two style names were accidentally switched,
makes the font sizes larger, and cleans up the CaptionTextView
styling APIs in preparation for moving it into the framework.
BUG:
10396663
Change-Id: I00999723a67bce2659d913b70dd4420ed32f955c
David Christie [Tue, 20 Aug 2013 22:24:21 +0000 (15:24 -0700)]
Switch location Settings and Power widget to use new Settings api.
Change-Id: I06b7a2e21876a18d9ad42fda2a6c6d4c7b6add48
Amith Yamasani [Tue, 20 Aug 2013 20:33:24 +0000 (20:33 +0000)]
Merge "Select max timeout, if it's in the timeout list" into klp-dev
Maggie Benthall [Tue, 20 Aug 2013 15:03:05 +0000 (11:03 -0400)]
Fix NPE in SecuritySettings.onResume()
when DISALLOW_CONFIG_CREDENTIALS is true.
Bug:
10405192
Change-Id: Id364ba3cd86151b504158bc253559d0da5e26273
OSDN Git Service
