Lifu Tang
98486fa1fa
Renamed "Location services" to "App settings"
...
- Fix b/10610559
Change-Id: I7f7167fb45ebeb045b4c0095448de0134a551eec
2013-09-03 16:38:05 -07:00
Lifu Tang
b3cd38eab4
Merge "Fixed the crash on screen rotation" into klp-dev
2013-09-03 21:26:33 +00:00
Lifu Tang
96f95212b8
Fixed the crash on screen rotation
...
- Fix b/10607566
Change-Id: I078e59af2a76deb272b870d7708ee4148c68590e
2013-09-03 13:53:16 -07:00
Russell Brenner
69a5043130
Merge changes Ie232b2d4,I81b6bf3f into klp-dev
...
* changes:
Add resources for light theme
Support Holo Light theme for wifi during setup
2013-09-03 20:26:42 +00:00
Tom O'Neill
81eae57f2c
Merge "Adapt to renaming of SettingInjectorService API constants" into klp-dev
2013-09-03 20:26:09 +00:00
Lifu Tang
7e2227fc65
Merge "Ignores AppOps entries belonging to other users" into klp-dev
2013-09-03 17:55:48 +00:00
Martijn Coenen
ec8f11da8f
Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev
2013-09-03 17:25:15 +00:00
Lifu Tang
c670c97b98
Ignores AppOps entries belonging to other users
...
- Fix b/10567352
Change-Id: I6aac030a426e5a881578b518a9cf6bad8679d087
2013-09-03 10:03:48 -07:00
Lifu Tang
06659c5a55
Merge "Creates Sipper even the consumption is very little" into klp-dev
2013-09-03 17:01:56 +00:00
Lifu Tang
47aab2eed7
Merge "Shows correct state when location sharing disabled" into klp-dev
2013-09-03 17:01:34 +00:00
Amith Yamasani
a2aaf0e60f
Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev
2013-09-03 15:57:24 +00:00
Lifu Tang
ad7bfbd346
Creates Sipper even the consumption is very little
...
Change-Id: I9682f262a481f3586760b8464b96eeb22814a840
2013-09-03 08:08:02 -07:00
Wink Saville
a2904f9d50
am d5c71fc4: am e38165ca: am 7bee4c29: Use correct action string for provisioning.
...
* commit 'd5c71fc4e613d80d1ff8c128f29d9c201bcb3f90':
Use correct action string for provisioning.
2013-08-30 17:26:19 -07:00
Lifu Tang
9294fdb6f8
Shows correct state when location sharing disabled
...
- Fix b/10553306
Change-Id: I01f69aaeb79e18ddf29da5aef7ea00938e674429
2013-08-30 17:19:09 -07:00
Amith Yamasani
3a14ae2655
Add a missing fragment to list of valid ones for top-level settings
...
Bug: 10552817
Change-Id: I1ea80de565d1ec58da834cdd67dab0cb71e635b7
2013-08-30 15:43:44 -07:00
Alan Viverette
6dde146df0
Merge "Update captioning settings to match revised API" into klp-dev
2013-08-30 21:35:04 +00:00
Martijn Coenen
a73aa32278
NFC Tap&Pay: deal with changes from API review.
...
Also, removed "Ask every time" mode.
Bug: 10550349
Change-Id: If7c300f9f446e3c31d594116ac8e20fb50d9ec3f
2013-08-30 12:57:42 -07:00
Tom O'Neill
1810a88e5f
Adapt to renaming of SettingInjectorService API constants
...
- Log how long it took to read the status of each setting.
- Fix some variable names.
- Affects b/10461474
Change-Id: Ic0a575f090bf7192b20e07c231bf9d7238571808
2013-08-30 10:52:55 -07:00
Russell Brenner
ac57f3e1eb
Add resources for light theme
...
Bug: 10407819
Change-Id: Ie232b2d48a8d67355d7c31a878ebaa79aae7c44d
2013-08-30 10:10:02 -07:00
Maggie Benthall
ac19f2bc1c
Merge "Fixes for pin-restricted settings." into klp-dev
2013-08-30 13:54:29 +00:00
Wink Saville
d5c71fc4e6
am e38165ca: am 7bee4c29: Use correct action string for provisioning.
...
* commit 'e38165caf08a164999b9518dd1f16c9f94d581e9':
Use correct action string for provisioning.
2013-08-29 20:42:59 -07:00
Wink Saville
7bee4c2942
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
2013-08-29 19:58:09 -07:00
Lifu Tang
5aacc54289
Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev
2013-08-29 23:43:59 +00:00
Wink Saville
79e2c32cfb
Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into klp-dev
2013-08-29 22:11:12 +00:00
Maggie Benthall
4453496448
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
2013-08-29 18:06:13 -04:00
Lifu Tang
007994279c
Replaced ContentQueryMap with CursorLoader
...
- Piggyback a trivial typo fix from previous change
- Fix b/10228666
Change-Id: I96c4f5c434b67caf10b3406eec4f3f7c5cf846e9
2013-08-29 14:46:29 -07:00
Tom O'Neill
4f08ddb28c
Merge "Make sure we've finished loading settings before processing any reloads" into klp-dev
2013-08-29 21:22:54 +00:00
Wink Saville
e24e596b08
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
...
Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
2013-08-29 14:15:01 -07:00
Martijn Coenen
ad320aa8d3
Merge "Update NFC payments to match new framework APIs." into klp-dev
2013-08-29 21:01:16 +00:00
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