PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,369 Commits 1 Branch 0 Tags
ec4f5ed1a95bd26e68766252f19c407b1479bb83
Commit Graph

11369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoffrey Borggaard
9e543cd0f7 Pin protect going into developer mode. 
Developer mode turns on ADB which we definately don't want students to do.
Bug: 10549646

Change-Id: Ibba6231d36427985da6c258002e319e33a15b9b8
 2013-08-30 16:16:21 -04: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
02f711263c am ac19f2bc: Merge "Fixes for pin-restricted settings." into klp-dev 
* commit 'ac19f2bc1c65865fa59feb7fbd9e19dd259048c3':
  Fixes for pin-restricted settings.
 2013-08-30 06:56:29 -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
e38165caf0 am 7bee4c29: Use correct action string for provisioning. 
* commit '7bee4c294204be49edf58e9251726425ffcc5748':
  Use correct action string for provisioning.
 2013-08-29 20:41:04 -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
Chong Zhang
4fee070366 wifi-display: add drop down list for Wps config method 
Bug: 9371882

Change-Id: I8c8c645bbb3db9f9d038f015f6aa6078ce3e56c3
 2013-08-29 17:32:14 -07:00
Lifu Tang
01ec62c46b am 5aacc542: Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev 
* commit '5aacc54289ab813fdefc2d6b3e8473a241706232':
  Replaced ContentQueryMap with CursorLoader
 2013-08-29 16:46:37 -07:00
Lifu Tang
5aacc54289 Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev 2013-08-29 23:43:59 +00:00
Wink Saville
67312293ae am ec3c7762: am 1bc2db22: am 0e042a44: am 289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev 
* commit 'ec3c7762129429e0666f77f812849181f3be461a':
  Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
 2013-08-29 15:17:48 -07:00
Wink Saville
ec3c776212 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.
 2013-08-29 15:15:53 -07:00
Wink Saville
c4112d6c88 am 79e2c32c: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into klp-dev 
* commit '79e2c32cfb96f617a4a8514f70d55d49ef509f43':
  Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
 2013-08-29 15:14:05 -07: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
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
Wink Saville
0e042a44a8 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.
 2013-08-29 10:23:04 -07:00
Wink Saville
289c2f0d30 Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev 2013-08-29 17:20:29 +00:00
Baligh Uddin
57b8416b4b am da1f8abd: (-s ours) am f7b5ad80: (-s ours) am da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE 
* commit 'da1f8abda6fa4b1cd1018c7415ebcfbea8fa1f6f':
  Import translations. DO NOT MERGE
 2013-08-29 08:04:27 -07:00
Baligh Uddin
28939160e4 am 0aad9801: (-s ours) am 439b1543: (-s ours) am 17d0af91: (-s ours) Import translations. DO NOT MERGE 
* commit '0aad9801705675c246fe548f687ed14359b53f78':
  Import translations. DO NOT MERGE
 2013-08-29 08:00:59 -07:00
Baligh Uddin
da1f8abda6 am f7b5ad80: (-s ours) am da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE 
* commit 'f7b5ad80a8e31d717ffed1a0b7a1403c3bf75cd1':
  Import translations. DO NOT MERGE
 2013-08-29 07:59:30 -07:00
Baligh Uddin
f7b5ad80a8 am da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE 
* commit 'da7395d6c5a92738c2e7130590f30a536ec94b54':
  Import translations. DO NOT MERGE
 2013-08-29 07:57:04 -07:00
Baligh Uddin
0aad980170 am 439b1543: (-s ours) am 17d0af91: (-s ours) Import translations. DO NOT MERGE 
* commit '439b1543119fd97d134c602d92fc6ce9a517be20':
  Import translations. DO NOT MERGE
 2013-08-29 07:56:04 -07:00
Baligh Uddin
192296f0b9 am 02f3f202: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '02f3f2028fbd50ad39936e5b295d89039469fb7c':
  Import translations. DO NOT MERGE
 2013-08-29 07:54:22 -07:00
Baligh Uddin
da7395d6c5 am c7902845: (-s ours) Import translations. DO NOT MERGE 
* commit 'c79028454106f4e73702c4bd4dde36a37beca90c':
  Import translations. DO NOT MERGE
 2013-08-29 07:53:56 -07:00
Baligh Uddin
439b154311 am 17d0af91: (-s ours) Import translations. DO NOT MERGE 
* commit '17d0af9160697f0fcb2d33ed4b4e91ad6769141c':
  Import translations. DO NOT MERGE
 2013-08-29 07:53:47 -07:00
Baligh Uddin
02f3f2028f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-29 14:50:25 +00:00
Baligh Uddin
7d84a4cb9c Import translations. DO NOT MERGE 
Change-Id: I778a192cc22364fde11327c0e5e0d92dce6ef965
Auto-generated-cl: translation import
 2013-08-28 23:36:55 -07:00
Baligh Uddin
17d0af9160 Import translations. DO NOT MERGE 
Change-Id: I2373253c983b6298e17d38882fc85ada1fd2e6e2
Auto-generated-cl: translation import
 2013-08-28 23:33:19 -07:00
Baligh Uddin
c790284541 Import translations. DO NOT MERGE 
Change-Id: I7e0a050642f956f175dcb349945089b4515c1bb5
Auto-generated-cl: translation import
 2013-08-28 23:32:03 -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
Amith Yamasani
079c412def Merge "Add more fragments to valid list for Wifi activity" into klp-dev 2013-08-28 21:52:59 +00:00