Commit Graph

5531 Commits

Author SHA1 Message Date
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
3e33cc628f am 4f08ddb2: Merge "Make sure we\'ve finished loading settings before processing any reloads" into klp-dev
* commit '4f08ddb28c4569004f888ea2955667b27485adf8':
  Make sure we've finished loading settings before processing any reloads
2013-08-29 14:26:27 -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
d38d6cb829 am ad320aa8: Merge "Update NFC payments to match new framework APIs." into klp-dev
* commit 'ad320aa8d350e859a87269c67d6afd2f5401cf61':
  Update NFC payments to match new framework APIs.
2013-08-29 14:06:24 -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
5301d57cbe am 1f2779f2: Merge "Fixed the widget location toggle button" into klp-dev
* commit '1f2779f2c46ab14e4f912a5f330b26c0a59ec137':
  Fixed the widget location toggle button
2013-08-29 11:33:18 -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
637d991e5e am 6760f923: Merge "Fix RTL layout of text in Battery history screen" into klp-dev
* commit '6760f92321d2013676863b533606563ed2041648':
  Fix RTL layout of text in Battery history screen
2013-08-28 18:07:51 -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
cc0a9be7c9 am dcf2509e: Merge "Disallows setting when user restriction applies" into klp-dev
* commit 'dcf2509e75059fcf3f34f82226597681107efb09':
  Disallows setting when user restriction applies
2013-08-28 15:38:24 -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
Amith Yamasani
2c3fedd0ac am 079c412d: Merge "Add more fragments to valid list for Wifi activity" into klp-dev
* commit '079c412def3472fc37750b7f778be3bb03114e38':
  Add more fragments to valid list for Wifi activity
2013-08-28 14:54:34 -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
b1755b37fc am 9506d857: Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev
* commit '9506d857cbc87a3dcedc8c3599f1d45ac6fe995e':
  Fix NPE in SecuritySettings.onResume()
2013-08-27 17:03:31 -07:00
Maggie Benthall
9506d857cb Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev 2013-08-28 00:00:01 +00:00
Amith Yamasani
90f5d21d40 am cb6ba728: Merge "Don\'t list apps that are disabled by the system" into klp-dev
* commit 'cb6ba728c5f872bc66e3b8ac3682b350cb7501f0':
  Don't list apps that are disabled by the system
2013-08-27 14:45:57 -07: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
ca51ca84f6 am 9066b914: Merge "Switch to new location mode API recommended by API council" into klp-dev
* commit '9066b9140c376cb1b66a3eee830d9dfa177c6056':
  Switch to new location mode API recommended by API council
2013-08-27 08:51:04 -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
4d6aaf30ea am 5d821bed: Merge "Adapt to SettingsInjectorService API changes" into klp-dev
* commit '5d821bedb1f065702b9920fe15a6f81bc19ba36b':
  Adapt to SettingsInjectorService API changes
2013-08-27 07:42:52 -07:00
Tom O'Neill
5d821bedb1 Merge "Adapt to SettingsInjectorService API changes" into klp-dev 2013-08-27 14:38:07 +00:00
Alan Viverette
14983f099c am 0f9a405f: Fix APN preference style
* commit '0f9a405fd58f8f5d30fbbe975e063e324d46a1f2':
  Fix APN preference style
2013-08-26 15:05:38 -07:00
Tom O'Neill
0af71e25f3 am cbf589e7: Merge "Handle races caused by rapid settings changed broadcasts" into klp-dev
* commit 'cbf589e73cd8b9a62c413c804b698e489f44c403':
  Handle races caused by rapid settings changed broadcasts
2013-08-26 15:03:54 -07:00
Jim Miller
ca43641787 am f6794f95: Merge "Add setting to disable keyguard widgets" into klp-dev
* commit 'f6794f95d19306e0f8a1edf02670d8dabd6daa5f':
  Add setting to disable keyguard widgets
2013-08-26 15:03:23 -07:00
Amith Yamasani
23f4337ba4 am 2a570787: Merge "Fix incorrect comparison" into klp-dev
* commit '2a5707874b6ec39798421f77e0ccf38dbaa1e65f':
  Fix incorrect comparison
2013-08-26 15:03:22 -07:00
Chong Zhang
41bfb63ff9 am 5114444e: Merge "wifi-display: add certification options" into klp-dev
* commit '5114444eca4e62f32cc85b9740dc0c66f87d5d99':
  wifi-display: add certification options
2013-08-26 15:03:07 -07: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
c387fee53d am 32e016b5: Reloads status messages for injected items
* commit '32e016b5fae1f4caf673ff1f062869dce0e94757':
  Reloads status messages for injected items
2013-08-22 18:26:49 -07:00
Lifu Tang
32e016b5fa Reloads status messages for injected items
Change-Id: I6bb95c4b7ff4118074fb51aeed31596eab1e7eef
2013-08-22 18:08:18 -07:00
Lifu Tang
594150daa5 am be9ebb44: Merge "Minor UI tweakings" into klp-dev
* commit 'be9ebb4436678ab5afecccc8a4bb7b9be6af370a':
  Minor UI tweakings
2013-08-22 14:48:10 -07:00
Lifu Tang
be9ebb4436 Merge "Minor UI tweakings" into klp-dev 2013-08-22 21:46:34 +00:00