Commit Graph

4934 Commits

Author SHA1 Message Date
Wink Saville
1bc2db2221 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.
2013-08-29 11:57:48 -07:00
Lifu Tang
1f2779f2c4 Merge "Fixed the widget location toggle button" into klp-dev 2013-08-29 18:31:27 +00:00
Tom O'Neill
f06dc32163 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
2013-08-29 10:48:13 -07:00
Martijn Coenen
573a21ada2 Update NFC payments to match new framework APIs.
Bug: 10262585
Change-Id: Id4167db50f8e5fe145441bdf73d151a61a8587ed
2013-08-28 19:30:41 -07:00
Amith Yamasani
6760f92321 Merge "Fix RTL layout of text in Battery history screen" into klp-dev 2013-08-29 01:04:11 +00:00
Lifu Tang
3d0bee59b8 Fixed the widget location toggle button
- Fix b/10531669

Change-Id: Iba08d515119c42e5c4de4ee02d6dd8aea404fc69
2013-08-28 17:01:43 -07:00
Lifu Tang
dcf2509e75 Merge "Disallows setting when user restriction applies" into klp-dev 2013-08-28 22:29:55 +00:00
Amith Yamasani
74809c2679 Fix RTL layout of text in Battery history screen
Change the anchor position and alignment direction for text.

Bug: 10447666
Change-Id: Ida4161c738cf9a32cc8ff98037f3755046e64e33
2013-08-28 15:14:16 -07:00
Wink Saville
bb77bf22d5 Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
2013-08-28 14:26:27 -07:00
Lifu Tang
4fb17c1c98 Disallows setting when user restriction applies
- Fix b/10116533

Change-Id: Ib171f9545c1651fb36c408decefa47b3d82ba3ab
2013-08-28 13:41:20 -07:00
Amith Yamasani
85654787eb Add more fragments to valid list for Wifi activity
Bug: 10508371
Change-Id: Ic2d2128433ae26ea6750281b978781cb56b97036
2013-08-28 12:38:46 -07:00
Russell Brenner
e8a80b5db3 Support Holo Light theme for wifi during setup
Adds programmatic support for holo light theme, activated by setting
EXTRA_THEME to "holo_light". Light-themed graphics are still pending.

Bug: 10407819
Change-Id: I81b6bf3fdf7ca3ee72b0f921b8adf6d858415887
2013-08-28 09:44:36 -07:00
Maggie Benthall
9506d857cb Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev 2013-08-28 00:00:01 +00:00
Amith Yamasani
cb6ba728c5 Merge "Don't list apps that are disabled by the system" into klp-dev 2013-08-27 21:42:58 +00:00
Alan Viverette
5ea751e48f Update captioning settings to match revised API
BUG: 10461210
Change-Id: I44d1fdeaead4357ff2591db6d9dda1c8a231103c
2013-08-27 11:11:00 -07:00
Tom O'Neill
9066b9140c Merge "Switch to new location mode API recommended by API council" into klp-dev 2013-08-27 15:48:34 +00:00
Tom O'Neill
5d821bedb1 Merge "Adapt to SettingsInjectorService API changes" into klp-dev 2013-08-27 14:38:07 +00:00
Tom O'Neill
93259c14f3 Switch to new location mode API recommended by API council
- Part of b/10461763 fix

Change-Id: I202ce4c817f24a1682796e92fed9cc3efcc31a81
2013-08-26 14:40:54 -07:00
Alan Viverette
0f9a405fd5 Fix APN preference style
BUG: 10445477
Change-Id: Ie1ce786ce49e1b68ffd38f6908189b8241773838
2013-08-26 13:25:59 -07:00
Tom O'Neill
b578ac4f94 Adapt to SettingsInjectorService API changes
- Part of fix for b/10461474

Change-Id: Ia37f444afc822a42ec21ebd2beae7aef8642547a
2013-08-26 09:47:55 -07:00
Tom O'Neill
cbf589e73c Merge "Handle races caused by rapid settings changed broadcasts" into klp-dev 2013-08-26 14:33:38 +00:00
Jim Miller
f6794f95d1 Merge "Add setting to disable keyguard widgets" into klp-dev 2013-08-24 01:28:40 +00:00
Amith Yamasani
2a5707874b Merge "Fix incorrect comparison" into klp-dev 2013-08-24 01:23:06 +00:00
Amith Yamasani
39272d07d7 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
2013-08-23 18:07:30 -07:00
Chong Zhang
5114444eca Merge "wifi-display: add certification options" into klp-dev 2013-08-23 23:19:18 +00:00
Tom O'Neill
e17ce5fb73 Handle races caused by rapid settings changed broadcasts
- Fix b/10447517

Change-Id: I63ef98c9023cee1a15be61b966aed06dc35e9bd5
2013-08-23 15:23:12 -07:00
Chong Zhang
6c607384c4 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
2013-08-22 23:47:08 -07:00
Lifu Tang
32e016b5fa Reloads status messages for injected items
Change-Id: I6bb95c4b7ff4118074fb51aeed31596eab1e7eef
2013-08-22 18:08:18 -07:00
Lifu Tang
be9ebb4436 Merge "Minor UI tweakings" into klp-dev 2013-08-22 21:46:34 +00:00
Lifu Tang
08a4c33a40 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
2013-08-22 12:36:20 -07:00
Amith Yamasani
8c89872a21 Merge "Fix custom restrictions launch mechanism" into klp-dev 2013-08-22 18:06:59 +00:00
Jonathan Dixon
f3267d9fee Merge "Add an Are you Sure to experiemental webview" into klp-dev 2013-08-22 05:00:20 +00:00
David Christie
9fb0ab85a2 Merge "Update power widget to represent gps instead of location master." into klp-dev 2013-08-22 04:14:56 +00:00
Jonathan Dixon
ba0ef659e1 Add an Are you Sure to experiemental webview
Bug: 10427705

Not bothering to translate strings as this will be deleted soon

Change-Id: I26721e606649d267d1b6507bc1a16ce91a63276a
2013-08-21 17:49:59 -07:00
David Christie
5eed792a76 Update power widget to represent gps instead of location master.
Change-Id: I62f701b612db2e31f9ad8b016dbf37ed7fd4ef26
2013-08-21 17:18:51 -07:00
Lifu Tang
25518c3b45 Sort "Location services" alphabetically
* Sort "Location services" items by title

* Throttle the rate of loading status messages

Change-Id: Iecb039a4ab94a810e11ef3e426e4a4b5c8c75c37
2013-08-21 16:52:14 -07:00
Alan Viverette
e873aeb3a6 Update caption preferences to use SubtitleView
Change-Id: I02230669c5e7be36006e04bb7110446265f122d9
2013-08-21 13:58:07 -07:00
David Christie
ae95da417c Merge "Switch location Settings and Power widget to use new Settings api." into klp-dev 2013-08-21 17:40:56 +00:00
Tom O'Neill
9facc23cd8 Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev 2013-08-21 14:53:19 +00:00
Jim Miller
ef3e701b78 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
2013-08-20 19:03:30 -07:00
Alan Viverette
bffd631a2a Allow the framework to recycle ApnPreference views
BUG: 10079104
Change-Id: Iaa4f155da12a141f16300076cc820d47e0c5779a
2013-08-20 18:14:33 -07:00
Alan Viverette
35bac19932 Merge "Fix background and line wrapping in CaptionTextView" into klp-dev 2013-08-20 23:46:20 +00:00
Amith Yamasani
d760a61936 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
2013-08-20 16:26:48 -07:00
Alan Viverette
c30f124c91 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
2013-08-20 15:58:38 -07:00
David Christie
512183ea8e Switch location Settings and Power widget to use new Settings api.
Change-Id: I06b7a2e21876a18d9ad42fda2a6c6d4c7b6add48
2013-08-20 15:24:21 -07:00
Amith Yamasani
0f5578ce2d Merge "Select max timeout, if it's in the timeout list" into klp-dev 2013-08-20 20:33:24 +00:00
Maggie Benthall
f48206e37e Fix NPE in SecuritySettings.onResume()
when DISALLOW_CONFIG_CREDENTIALS is true.

Bug: 10405192
Change-Id: Id364ba3cd86151b504158bc253559d0da5e26273
2013-08-20 11:03:05 -04:00
Lifu Tang
d3dbc6e3a1 Launches the Location setting as fragment
Change-Id: I0fb04a346236676ce9483a0c4d1fc3b2b590b08c
2013-08-19 18:42:56 -07:00
Lifu Tang
b9ab196bb5 Sort recent apps, show message when no recent apps
Change-Id: I70bb1913435b46fc87aec10075e43f98ef07ef62
2013-08-19 17:56:14 -07:00
Lifu Tang
dbd2f75929 Merge "Supress Location button when coming from Location" into klp-dev 2013-08-19 21:33:22 +00:00