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

11468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
ba84f2db48 Merge "Import translations. DO NOT MERGE" 2013-09-04 05:00:14 +00:00
Amith Yamasani
912fb434b4 am 43ce434c: am 9b444f78: Merge "Pass correct user id for the extra" into klp-dev 
* commit '43ce434c2c4c1f062bd3e41cc558e3bfdc22dfc8':
  Pass correct user id for the extra
 2013-09-03 18:02:53 -07:00
Amith Yamasani
43ce434c2c am 9b444f78: Merge "Pass correct user id for the extra" into klp-dev 
* commit '9b444f78f14384b59b01f966b044bb23c6af4982':
  Pass correct user id for the extra
 2013-09-03 18:00:17 -07:00
Amith Yamasani
9b444f78f1 Merge "Pass correct user id for the extra" into klp-dev 2013-09-04 00:55:18 +00:00
Geoffrey Borggaard
e92c3999b2 am 67f93f16: am af6cdb2b: Merge "Pin protect going into developer mode." into klp-dev 
* commit '67f93f16505d8c439ace54e9849c3003e273afaf':
  Pin protect going into developer mode.
 2013-09-03 17:45:25 -07:00
Amith Yamasani
e63cc20570 Pass correct user id for the extra 
This was causing PrintManagerService to get a broadcast with an incorrect
userid and ended up crashing the SettingsProvider.

Bug: 10608503
Change-Id: I4693de181ddfa599d685ac9bd16ac15cea8b2e52
 2013-09-03 17:44:49 -07:00
Geoffrey Borggaard
67f93f1650 am af6cdb2b: Merge "Pin protect going into developer mode." into klp-dev 
* commit 'af6cdb2b30a875b0a563196bb5c405b080b3cbe0':
  Pin protect going into developer mode.
 2013-09-03 17:43:51 -07:00
Geoffrey Borggaard
af6cdb2b30 Merge "Pin protect going into developer mode." into klp-dev 2013-09-04 00:41:51 +00:00
Lifu Tang
3c3d03702b am 1a72ab95: am f4c4294c: Merge "Renamed "Location services" to "App settings"" into klp-dev 
* commit '1a72ab950d64ef4e13180bea78f3c215fb5f9159':
  Renamed "Location services" to "App settings"
 2013-09-03 17:18:37 -07:00
Lifu Tang
1a72ab950d am f4c4294c: Merge "Renamed "Location services" to "App settings"" into klp-dev 
* commit 'f4c4294c502d774c1c56d6b2dca56a604cc85f87':
  Renamed "Location services" to "App settings"
 2013-09-03 17:16:14 -07:00
Lifu Tang
f4c4294c50 Merge "Renamed "Location services" to "App settings"" into klp-dev 2013-09-04 00:13:10 +00:00
Vineeta Srivastava
dfd3099d5a am 4fba9109: am 58db3418: Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev 
* commit '4fba910955f54616baf462646bcc21e762d197d1':
  Show regulatory info based on hardware sku in Settings app.
 2013-09-03 16:57:11 -07:00
Vineeta Srivastava
4fba910955 am 58db3418: Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev 
* commit '58db341851a0858339f83b432807e6ed87ca9fe5':
  Show regulatory info based on hardware sku in Settings app.
 2013-09-03 16:52:51 -07:00
Vineeta Srivastava
58db341851 Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev 2013-09-03 23:48:34 +00:00
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
7d6a795cf0 am 42f82284: am b3cd38ea: Merge "Fixed the crash on screen rotation" into klp-dev 
* commit '42f82284a10163033842b1c93a8e767ca0527046':
  Fixed the crash on screen rotation
 2013-09-03 14:31:45 -07:00
Lifu Tang
42f82284a1 am b3cd38ea: Merge "Fixed the crash on screen rotation" into klp-dev 
* commit 'b3cd38eab4402a95e779d4d0b92480b7c53fa473':
  Fixed the crash on screen rotation
 2013-09-03 14:29:13 -07:00
Lifu Tang
b3cd38eab4 Merge "Fixed the crash on screen rotation" into klp-dev 2013-09-03 21:26:33 +00:00
Baligh Uddin
bebffade41 Import translations. DO NOT MERGE 
Change-Id: Idb25d35ebc6e5786e8cdf09ac97ee2f902f18249
Auto-generated-cl: translation import
 2013-09-03 14:08:34 -07: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
2f51d540fb am 8725d762: am 69a50431: Merge changes Ie232b2d4,I81b6bf3f into klp-dev 
* commit '8725d762038cd8af819ba45eee230e3af3623e0c':
  Add resources for light theme
  Support Holo Light theme for wifi during setup
 2013-09-03 13:34:40 -07:00
Tom O'Neill
fdd51e5b0b am dc39241b: am 81eae57f: Merge "Adapt to renaming of SettingInjectorService API constants" into klp-dev 
* commit 'dc39241b536bddb3e099832e2e2d483d65c60a97':
  Adapt to renaming of SettingInjectorService API constants
 2013-09-03 13:34:39 -07:00
Russell Brenner
8725d76203 am 69a50431: Merge changes Ie232b2d4,I81b6bf3f into klp-dev 
* commit '69a5043130ae0bb01d7b2608aac340b7abc0c590':
  Add resources for light theme
  Support Holo Light theme for wifi during setup
 2013-09-03 13:32:00 -07:00
Tom O'Neill
dc39241b53 am 81eae57f: Merge "Adapt to renaming of SettingInjectorService API constants" into klp-dev 
* commit '81eae57f2c16e9f2934cfdf887e8f4832f703f4a':
  Adapt to renaming of SettingInjectorService API constants
 2013-09-03 13:32:00 -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
Vineeta Srivastava
c26807f20b Show regulatory info based on hardware sku in Settings app. 
Use ro.boot.hardware.sku to read hardware sku property. When this property is
 set use regulatory_info_<sku>.img. By default use regulatory_info.png

Updated layout to set ImageView.

Bug: 9378140

Change-Id: I8e3622a89742333818297759585227c6290ccf31
 2013-09-03 13:05:04 -07:00
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