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

11437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lifu Tang
f0286eaad6 am 703689be: am 7e2227fc: Merge "Ignores AppOps entries belonging to other users" into klp-dev 
* commit '703689beed8b39b30f0fd57f9735f3f800bd86b3':
  Ignores AppOps entries belonging to other users
 2013-09-03 11:00:39 -07:00
Lifu Tang
703689beed am 7e2227fc: Merge "Ignores AppOps entries belonging to other users" into klp-dev 
* commit '7e2227fc657cf22f39a5db4741e6ab46b20c0dc2':
  Ignores AppOps entries belonging to other users
 2013-09-03 10:57:30 -07: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
4b396d81bc am 2b8511c1: am ec8f11da: Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev 
* commit '2b8511c1531c1b213f2a23d23772eb8df550cc5a':
  NFC Tap&Pay: deal with changes from API review.
 2013-09-03 10:34:45 -07:00
Martijn Coenen
2b8511c153 am ec8f11da: Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev 
* commit 'ec8f11da8fb7b5f698e2861311e1291f6f5770f9':
  NFC Tap&Pay: deal with changes from API review.
 2013-09-03 10:28:28 -07: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
402848c130 am 026702df: am 06659c5a: Merge "Creates Sipper even the consumption is very little" into klp-dev 
* commit '026702dff008408c90678584332b1a798ed5fb90':
  Creates Sipper even the consumption is very little
 2013-09-03 10:12:20 -07:00
Lifu Tang
5bcb3d8190 am 79063a45: am 47aab2ee: Merge "Shows correct state when location sharing disabled" into klp-dev 
* commit '79063a456932f91d521a80f9c643ca1397654698':
  Shows correct state when location sharing disabled
 2013-09-03 10:12:19 -07:00
Lifu Tang
026702dff0 am 06659c5a: Merge "Creates Sipper even the consumption is very little" into klp-dev 
* commit '06659c5a55c8ad5b7b640d23ed03fa2a8cbbab49':
  Creates Sipper even the consumption is very little
 2013-09-03 10:09:16 -07:00
Lifu Tang
79063a4569 am 47aab2ee: Merge "Shows correct state when location sharing disabled" into klp-dev 
* commit '47aab2eed7263e9593f1e866672f73ec30c7bc17':
  Shows correct state when location sharing disabled
 2013-09-03 10:09:15 -07: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
5e7a8a6752 am c6380a26: am a2aaf0e6: Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev 
* commit 'c6380a2622978fefb9b007e3ad09744ab1aff20b':
  Add a missing fragment to list of valid ones for top-level settings
 2013-09-03 09:02:41 -07:00
Amith Yamasani
c6380a2622 am a2aaf0e6: Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev 
* commit 'a2aaf0e60fcbfc5b6eaac06e9663e2af0bc82c7c':
  Add a missing fragment to list of valid ones for top-level settings
 2013-09-03 09:00:33 -07: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
45cd89e2a9 am c2fbc774: am a2904f9d: am d5c71fc4: am e38165ca: am 7bee4c29: Use correct action string for provisioning. 
* commit 'c2fbc77451546a51c82d2b50825a7a0e51e4e0a1':
  Use correct action string for provisioning.
 2013-08-30 17:31:17 -07:00
Wink Saville
c2fbc77451 am a2904f9d: am d5c71fc4: am e38165ca: am 7bee4c29: Use correct action string for provisioning. 
* commit 'a2904f9d5091ef5055d97adf72d32e8c19551c8e':
  Use correct action string for provisioning.
 2013-08-30 17:29:15 -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
28aac80c1b am c7e34676: am 6dde146d: Merge "Update captioning settings to match revised API" into klp-dev 
* commit 'c7e34676ffffa03269f5686072abd5eae60fa85f':
  Update captioning settings to match revised API
 2013-08-30 14:42:50 -07:00
Alan Viverette
c7e34676ff am 6dde146d: Merge "Update captioning settings to match revised API" into klp-dev 
* commit '6dde146df030dfada1a9e112621e97424a2b6e3c':
  Update captioning settings to match revised API
 2013-08-30 14:38:21 -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
Maggie Benthall
764761f7ad am 02f71126: am ac19f2bc: Merge "Fixes for pin-restricted settings." into klp-dev 
* commit '02f711263cf30daf90361a4ba93bef4c2d0e38fc':
  Fixes for pin-restricted settings.
 2013-08-30 06:59: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
Lifu Tang
3a437875f1 am 01ec62c4: am 5aacc542: Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev 
* commit '01ec62c46bc8bb54282cc11ee2c34d01d6986cc5':
  Replaced ContentQueryMap with CursorLoader
 2013-08-29 16:50:43 -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
08e12b096e am 67312293: am ec3c7762: am 1bc2db22: am 0e042a44: am 289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev 
* commit '67312293aea0083d2905f74756d02a37ec999b6c':
  Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
 2013-08-29 15:20:15 -07: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
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