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

3591 Commits

Author SHA1 Message Date
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
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
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
Baligh Uddin
c63e097aa7 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-04 05:00:08 +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
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
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
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
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
Baligh Uddin
7d84a4cb9c Import translations. DO NOT MERGE 
Change-Id: I778a192cc22364fde11327c0e5e0d92dce6ef965
Auto-generated-cl: translation import
 2013-08-28 23:36:55 -07:00
Martijn Coenen
573a21ada2 Update NFC payments to match new framework APIs. 
Bug: 10262585
Change-Id: Id4167db50f8e5fe145441bdf73d151a61a8587ed
 2013-08-28 19:30:41 -07:00
Russell Brenner
e8a80b5db3 Support Holo Light theme for wifi during setup 
Adds programmatic support for holo light theme, activated by setting
EXTRA_THEME to "holo_light". Light-themed graphics are still pending.

Bug: 10407819
Change-Id: I81b6bf3fdf7ca3ee72b0f921b8adf6d858415887
 2013-08-28 09:44:36 -07:00
Baligh Uddin
f92ee42545 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-28 02:34:25 +00:00
Alan Viverette
5ea751e48f Update captioning settings to match revised API 
BUG: 10461210
Change-Id: I44d1fdeaead4357ff2591db6d9dda1c8a231103c
 2013-08-27 11:11:00 -07:00
Alan Viverette
14983f099c am 0f9a405f: Fix APN preference style 
* commit '0f9a405fd58f8f5d30fbbe975e063e324d46a1f2':
  Fix APN preference style
 2013-08-26 15:05:38 -07:00
Jim Miller
ca43641787 am f6794f95: Merge "Add setting to disable keyguard widgets" into klp-dev 
* commit 'f6794f95d19306e0f8a1edf02670d8dabd6daa5f':
  Add setting to disable keyguard widgets
 2013-08-26 15:03:23 -07:00
Lifu Tang
2110efe50f am 85dfc900: Merge "Allows multi-line message on small-screen devices" into klp-dev 
* commit '85dfc9009fdad338cdda62cbcc549fde8479bdce':
  Allows multi-line message on small-screen devices
 2013-08-26 15:03:19 -07:00
Chong Zhang
41bfb63ff9 am 5114444e: Merge "wifi-display: add certification options" into klp-dev 
* commit '5114444eca4e62f32cc85b9740dc0c66f87d5d99':
  wifi-display: add certification options
 2013-08-26 15:03:07 -07:00
Baligh Uddin
b0de3b5ddf Import translations. DO NOT MERGE 
Change-Id: Ibf7604d13d020201dd350b35765da372c2f9fbbb
Auto-generated-cl: translation import
 2013-08-26 13:59:51 -07:00
Alan Viverette
0f9a405fd5 Fix APN preference style 
BUG: 10445477
Change-Id: Ie1ce786ce49e1b68ffd38f6908189b8241773838
 2013-08-26 13:25:59 -07:00
Jim Miller
f6794f95d1 Merge "Add setting to disable keyguard widgets" into klp-dev 2013-08-24 01:28:40 +00:00
Lifu Tang
85dfc9009f Merge "Allows multi-line message on small-screen devices" into klp-dev 2013-08-24 00:00:36 +00:00
Chong Zhang
5114444eca Merge "wifi-display: add certification options" into klp-dev 2013-08-23 23:19:18 +00:00
Lifu Tang
3a15402243 Allows multi-line message on small-screen devices 
Change-Id: Ief7e152165059cea165f1271ab27a8a42537db8f
 2013-08-23 15:32:25 -07:00
Baligh Uddin
a0aee43e84 Import translations. DO NOT MERGE 
Change-Id: I1680219b7f4f2e9d71bb901d7708ef6eb153cfb6
Auto-generated-cl: translation import
 2013-08-23 10:21:09 -07:00
Chong Zhang
6c607384c4 wifi-display: add certification options 
- Checkbox to show certification menu in "Developer options"

- Certification menu to Wireless Display Settings, providing
  misc control options required to certify

Bug: 9371882
Change-Id: Icf74d1122a9dc813b2cf95b6606a8a600a6b9cd1
 2013-08-22 23:47:08 -07:00
Lifu Tang
594150daa5 am be9ebb44: Merge "Minor UI tweakings" into klp-dev 
* commit 'be9ebb4436678ab5afecccc8a4bb7b9be6af370a':
  Minor UI tweakings
 2013-08-22 14:48:10 -07:00
Lifu Tang
be9ebb4436 Merge "Minor UI tweakings" into klp-dev 2013-08-22 21:46:34 +00:00
Lifu Tang
08a4c33a40 Minor UI tweakings 
* Changed PreferenceScreen to Preference.

* Adjusted the "No recent app" message layout.

* No "Location services" category when empty.

* Removed "Under Construction" finally, hooray!

Change-Id: I83fd1d7a1b0235ad21b3a5c54542e937b60b3940
 2013-08-22 12:36:20 -07:00