Commit Graph

4189 Commits

Author SHA1 Message Date
Fabrice Di Meglio
9e8765f186 am f37120b9: am 4c7de613: Merge "Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings" into klp-dev
* commit 'f37120b9983fc73fd7ddfc9e93517ed6ac9023a2':
  Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings
2013-09-06 13:46:42 -07:00
Fabrice Di Meglio
f37120b998 am 4c7de613: Merge "Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings" into klp-dev
* commit '4c7de61320f3ea1df8d5cdd3d0645830b67722ea':
  Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings
2013-09-06 13:38:45 -07:00
Fabrice Di Meglio
4c7de61320 Merge "Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings" into klp-dev 2013-09-06 20:05:18 +00:00
Fabrice Di Meglio
37f3c8f574 Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings
- well this CL is only for preventing a wrong rendering (the real CL would need to be one latter
and would need to fix the onDraw(Canvas) for LinearColorBar so that it takes care of the layout direction)
- force LTR layout direction on the LinearColorBar, hence preventing the two TextView to render their
text "in the middle".
- use BidiFormatter to wrap number strings

Change-Id: Ie164e5509c0364a81c85a3ac69f97a89f20a4130
2013-09-06 11:19:27 -07:00
Lifu Tang
553c73bfad am f534039f: am 0a0635c1: Merge "Don\'t show explicit time when no recent apps" into klp-dev
* commit 'f534039f0cdb595c4d7204ce2b4eead042cf9e4c':
  Don't show explicit time when no recent apps
2013-09-06 09:52:06 -07:00
Baligh Uddin
553995204b Merge "Import translations. DO NOT MERGE" 2013-09-06 03:34:28 +00:00
Baligh Uddin
f1e0c65efb Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-06 03:34:18 +00:00
Lifu Tang
f534039f0c am 0a0635c1: Merge "Don\'t show explicit time when no recent apps" into klp-dev
* commit '0a0635c10ebf73d8133a7f96d6cae89ea9282dd2':
  Don't show explicit time when no recent apps
2013-09-05 19:03:28 -07:00
Lifu Tang
0a0635c10e Merge "Don't show explicit time when no recent apps" into klp-dev 2013-09-06 02:01:18 +00:00
Lifu Tang
9e5251817e Don't show explicit time when no recent apps
- Partial fix for b/10638903

Change-Id: I38d681c52b3d03cdece48d3cdc027dcbe66bd0f2
2013-09-05 14:50:29 -07:00
Svetoslav Ganov
4d108e4ff9 am e4443058: am 10cbbc55: Merge "Print settings polish" into klp-dev
* commit 'e44430583a40dfc178924256cc4e6776f9d00701':
  Print settings polish
2013-09-05 14:45:11 -07:00
Svetoslav Ganov
e44430583a am 10cbbc55: Merge "Print settings polish" into klp-dev
* commit '10cbbc5515a30dfa347f0a7b816ebde8cbb0e0f7':
  Print settings polish
2013-09-05 14:41:35 -07:00
Svetoslav Ganov
10cbbc5515 Merge "Print settings polish" into klp-dev 2013-09-05 21:38:11 +00:00
Baligh Uddin
672c4d06f6 Import translations. DO NOT MERGE
Change-Id: I15246270911f331f81c3e621baf82f90335529be
Auto-generated-cl: translation import
2013-09-05 12:52:47 -07:00
Baligh Uddin
d7aea197af Import translations. DO NOT MERGE
Change-Id: I4e3b8d9ebc0a38940b8864bbee841002385f5fb2
Auto-generated-cl: translation import
2013-09-05 12:46:15 -07:00
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
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
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
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
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
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
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
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
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
Russell Brenner
ac57f3e1eb Add resources for light theme
Bug: 10407819
Change-Id: Ie232b2d48a8d67355d7c31a878ebaa79aae7c44d
2013-08-30 10:10:02 -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
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