Commit Graph

11522 Commits

Author SHA1 Message Date
Svetoslav Ganov
74648ac808 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-05 00:01:40 -07:00
Dianne Hackborn
ec4f5ed1a9 am dd600b60: Merge "Add details screen to proc stats." into klp-dev
* commit 'dd600b603d98e28219a9a38a62f2527db05736bb':
  Add details screen to proc stats.
2013-09-04 18:31:29 -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
8ed62da68b am f7092bc6: Merge "Implementing print settings as per UX spec." into klp-dev
* commit 'f7092bc6bfb16695d73f984d3c2cf557c63a17f1':
  Implementing print settings as per UX spec.
2013-09-04 17:20:45 -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
4459ca503c am 35ec3b7f: Merge "wifi-display: add drop down list for Wps config method" into klp-dev
* commit '35ec3b7fa389e9a2ddc131eb3a75b2f3dbc8330e':
  wifi-display: add drop down list for Wps config method
2013-09-04 15:11:34 -07: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
f49005f9ab am 97df9822: Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev
* commit '97df982296244cc067c281b97ff2a6ade2a8ca31':
  Switch to receiving LocationManager.MODE_CHANGED_ACTION
2013-09-04 07:22:29 -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
Baligh Uddin
538f03a285 am c63e097a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c63e097aa7b6200f78714da892ef6a3fe0bd4aba':
  Import translations. DO NOT MERGE
2013-09-03 22:02:40 -07:00
Baligh Uddin
c63e097aa7 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-04 05:00:08 +00: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
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
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
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
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
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
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
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
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
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
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
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
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
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