Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,278 Commits 1 Branch 0 Tags
b0c381d8ea5ff0f472a63d11d655dd42cabfa258
Commit Graph

11278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
b0c381d8ea Print settings polish 
1. Added support for launching the top level print settings.

2. Updated some strings.

3. Removed the uninstall option for a print service.

4. Added search for the list of printers of a print service.

Change-Id: I9e175ba78b2d22b2bf90cf79153dc73327dfaff1
 2013-09-06 10:49:54 -07:00
The Android Automerger
b28eb290d5 merge in klp-release history after reset to klp-dev 2013-09-05 06:01:49 -07:00
Dianne Hackborn
dd600b603d Merge "Add details screen to proc stats." into klp-dev 2013-09-05 01:26:42 +00:00
Dianne Hackborn
0448673834 Add details screen to proc stats. 
Lets you see the actual RAM use and % running time, a list of
all of the services that are associated with it (kind-of, not
working correctly for those that share processes), and most
importantly a glorious FORCE STOP button.

Change-Id: I34ac30c88f1187227a8a7809ae103118c8b9a865
 2013-09-04 17:27:30 -07:00
Svetoslav
f7092bc6bf Merge "Implementing print settings as per UX spec." into klp-dev 2013-09-05 00:18:48 +00:00
Chong Zhang
35ec3b7fa3 Merge "wifi-display: add drop down list for Wps config method" into klp-dev 2013-09-04 22:07:19 +00:00
Svetoslav
2d53165359 Implementing print settings as per UX spec. 
Change-Id: Iafe99a1e959472f893cf168d952d9dd19ff160c0
 2013-09-04 14:40:02 -07:00
Tom O'Neill
97df982296 Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev 2013-09-04 14:20:03 +00:00
The Android Automerger
3da6b06d01 merge in klp-release history after reset to klp-dev 2013-09-04 06:01:48 -07:00
Baligh Uddin
c63e097aa7 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-04 05:00:08 +00:00
Amith Yamasani
9b444f78f1 Merge "Pass correct user id for the extra" into klp-dev 2013-09-04 00:55:18 +00: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
af6cdb2b30 Merge "Pin protect going into developer mode." into klp-dev 2013-09-04 00:41:51 +00:00
Lifu Tang
f4c4294c50 Merge "Renamed "Location services" to "App settings"" into klp-dev 2013-09-04 00:13:10 +00: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
b3cd38eab4 Merge "Fixed the crash on screen rotation" into klp-dev 2013-09-03 21:26:33 +00:00
Baligh Uddin
30b128d39f Import translations. DO NOT MERGE 
Change-Id: I2a10a77eb978fae7a97c25de71007605a4e20248
Auto-generated-cl: translation import
 2013-09-03 14:01:35 -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
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
7e2227fc65 Merge "Ignores AppOps entries belonging to other users" into klp-dev 2013-09-03 17:55:48 +00: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
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
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
Tom O'Neill
4af6514c78 Switch to receiving LocationManager.MODE_CHANGED_ACTION 
- From LocationManager.PROVIDERS_CHANGED

- Part of fix for b/10409275

Change-Id: I4030c8df4db942777d6035266a8ed7f18e458fb5
 2013-09-03 07:56:53 -07:00
The Android Automerger
89129c0087 merge in klp-release history after reset to klp-dev 2013-09-02 06:01:42 -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
6dde146df0 Merge "Update captioning settings to match revised API" into klp-dev 2013-08-30 21:35:04 +00:00
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
Wink Saville
d2f75b8fe8 Use MOBILE_PROVISIONING_ACTION for manage mobile plan. 
Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
 2013-08-30 11:26:44 -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
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
5aacc54289 Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev 2013-08-29 23:43:59 +00:00
Baligh Uddin
cbec145cb3 Import translations. DO NOT MERGE 
Change-Id: I778a192cc22364fde11327c0e5e0d92dce6ef965
Auto-generated-cl: translation import
 2013-08-29 16:12:00 -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
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