Commit Graph

12613 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
b70413cdfa am ec4f5ed1: am dd600b60: Merge "Add details screen to proc stats." into klp-dev
* commit 'ec4f5ed1a95bd26e68766252f19c407b1479bb83':
  Add details screen to proc stats.
2013-09-04 18:36:12 -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
Svetoslav
ab5d9fd106 am 8ed62da6: am f7092bc6: Merge "Implementing print settings as per UX spec." into klp-dev
* commit '8ed62da68b1682245e2c8d093c96a6a3f169679a':
  Implementing print settings as per UX spec.
2013-09-04 17:43:48 -07: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
e8b3de4c44 am 4459ca50: am 35ec3b7f: Merge "wifi-display: add drop down list for Wps config method" into klp-dev
* commit '4459ca503c68edaaba357ce577c5dee0e586b252':
  wifi-display: add drop down list for Wps config method
2013-09-04 15:14:34 -07: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
0b5a8e7e43 am f49005f9: am 97df9822: Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev
* commit 'f49005f9ab2d470488d24c2b534787768ebc8ebb':
  Switch to receiving LocationManager.MODE_CHANGED_ACTION
2013-09-04 07:24:44 -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
The Android Automerger
3da6b06d01 merge in klp-release history after reset to klp-dev 2013-09-04 06:01:48 -07:00
Baligh Uddin
be2cca33b9 am 538f03a2: (-s ours) am c63e097a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '538f03a2857c1b40663c597cd85368a21b628263':
  Import translations. DO NOT MERGE
2013-09-03 22:04:57 -07: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
ba84f2db48 Merge "Import translations. DO NOT MERGE" 2013-09-04 05:00:14 +00:00
Baligh Uddin
c63e097aa7 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-04 05:00:08 +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
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
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