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

11604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b1195f8cb4 am c4112d6c: am 79e2c32c: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into klp-dev 
* commit 'c4112d6c88452e5bcfc28df632640b12062cdf14':
  Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
 2013-08-29 15:16:30 -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
c396aac47a am 3e33cc62: am 4f08ddb2: Merge "Make sure we\'ve finished loading settings before processing any reloads" into klp-dev 
* commit '3e33cc628f5f21758c9b9fa5f35d81ca6bd232ec':
  Make sure we've finished loading settings before processing any reloads
 2013-08-29 14:28:34 -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
84ce93213d am d38d6cb8: am ad320aa8: Merge "Update NFC payments to match new framework APIs." into klp-dev 
* commit 'd38d6cb829c64343038c023e69d33c8cbc925a4d':
  Update NFC payments to match new framework APIs.
 2013-08-29 14:09:37 -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
9184b8fe4d am 5301d57c: am 1f2779f2: Merge "Fixed the widget location toggle button" into klp-dev 
* commit '5301d57cbe9c5e7c11f842188fb8a13127918e68':
  Fixed the widget location toggle button
 2013-08-29 11:35:22 -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
365c247440 am 57b8416b: (-s ours) am da1f8abd: (-s ours) am f7b5ad80: (-s ours) am da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE 
* commit '57b8416b4b31ef5a76553dc3e51510c46bfb8320':
  Import translations. DO NOT MERGE
 2013-08-29 08:07:45 -07: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
d546832b25 am 28939160: (-s ours) am 0aad9801: (-s ours) am 439b1543: (-s ours) am 17d0af91: (-s ours) Import translations. DO NOT MERGE 
* commit '28939160e41999fa1b0b0ef3a7dc0ac3f0157d1e':
  Import translations. DO NOT MERGE
 2013-08-29 08:04:06 -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
d6f12848b4 am 192296f0: (-s ours) am 02f3f202: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '192296f0b9ee46831ecb36dbe8255fa3e58c3add':
  Import translations. DO NOT MERGE
 2013-08-29 07:56:26 -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
b08c2ec3ef Merge "Import translations. DO NOT MERGE" 2013-08-29 14:50:35 +00:00
Baligh Uddin
02f3f2028f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-29 14:50:25 +00:00
Baligh Uddin
4f0ca04688 Import translations. DO NOT MERGE 
Change-Id: Iaf20a20f5cdc9d59579f1a901138f26b9a449216
Auto-generated-cl: translation import
 2013-08-28 23:43:04 -07: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
bdc9d28e60 am 637d991e: am 6760f923: Merge "Fix RTL layout of text in Battery history screen" into klp-dev 
* commit '637d991e5e47978cc15ac860f990642c9851f19f':
  Fix RTL layout of text in Battery history screen
 2013-08-28 18:11:18 -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
36b5bf1827 am cc0a9be7: am dcf2509e: Merge "Disallows setting when user restriction applies" into klp-dev 
* commit 'cc0a9be7c988c3ea6229ee55deb0bc969231a927':
  Disallows setting when user restriction applies
 2013-08-28 15:40:32 -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
ce4f76b64c am 2c3fedd0: am 079c412d: Merge "Add more fragments to valid list for Wifi activity" into klp-dev 
* commit '2c3fedd0ac621f9dd9c5d84818affeeecfb31cb7':
  Add more fragments to valid list for Wifi activity
 2013-08-28 14:58:58 -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