Commit Graph

3704 Commits

Author SHA1 Message Date
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
Baligh Uddin
4f0ca04688 Import translations. DO NOT MERGE
Change-Id: Iaf20a20f5cdc9d59579f1a901138f26b9a449216
Auto-generated-cl: translation import
2013-08-28 23:43:04 -07: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
c6e3e37f9a Merge "Import translations. DO NOT MERGE" 2013-08-28 02:34:36 +00: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
ad4366a871 am 14983f09: am 0f9a405f: Fix APN preference style
* commit '14983f099c98ab89bde035182c32c2a58daec3a4':
  Fix APN preference style
2013-08-26 15:09:40 -07:00
Jim Miller
f9e4337890 am ca436417: am f6794f95: Merge "Add setting to disable keyguard widgets" into klp-dev
* commit 'ca436417875bacc337080a7066395ca1ca0b2492':
  Add setting to disable keyguard widgets
2013-08-26 15:09:38 -07:00
Lifu Tang
541cdaafd0 am 2110efe5: am 85dfc900: Merge "Allows multi-line message on small-screen devices" into klp-dev
* commit '2110efe50f24606c9c44711321b5600d2de50964':
  Allows multi-line message on small-screen devices
2013-08-26 15:09:37 -07:00
Chong Zhang
8a7164c33a am 41bfb63f: am 5114444e: Merge "wifi-display: add certification options" into klp-dev
* commit '41bfb63ff90d3791099455aef59738d841b5f3e5':
  wifi-display: add certification options
2013-08-26 15:09:37 -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
1d619e1ead Import translations. DO NOT MERGE
Change-Id: I62ee2b860598c7e98e6a1ad74f80a086b1da2d77
Auto-generated-cl: translation import
2013-08-26 14:06:36 -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
4981c4c10a am 594150da: am be9ebb44: Merge "Minor UI tweakings" into klp-dev
* commit '594150daa55941c09788a7e9122f2e1987c8a60d':
  Minor UI tweakings
2013-08-22 14:50:54 -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
Baligh Uddin
2768a5e992 Merge "Import translations. DO NOT MERGE" 2013-08-22 17:52:43 +00:00
Baligh Uddin
81eab3f04a Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-22 17:52:33 +00:00
Baligh Uddin
293ed7bd4c Import translations. DO NOT MERGE
Change-Id: I2c72ecd95f32cca154a87fee61ce55634e95f3e5
Auto-generated-cl: translation import
2013-08-21 16:15:15 -07:00
Baligh Uddin
0e71d6fee4 Import translations. DO NOT MERGE
Change-Id: I1f4834979c234fd3a3b2238bc4e3e5da68d033db
Auto-generated-cl: translation import
2013-08-21 16:08:45 -07:00
Alan Viverette
cd63a19c61 am b46f9f42: am e873aeb3: Update caption preferences to use SubtitleView
* commit 'b46f9f42f707ec1ebd4783013fe6e0d122721fd0':
  Update caption preferences to use SubtitleView
2013-08-21 14:16:32 -07:00
Alan Viverette
b46f9f42f7 am e873aeb3: Update caption preferences to use SubtitleView
* commit 'e873aeb3a659ac970609cebb5ec2f460afd1206a':
  Update caption preferences to use SubtitleView
2013-08-21 14:12:28 -07:00
Alan Viverette
e873aeb3a6 Update caption preferences to use SubtitleView
Change-Id: I02230669c5e7be36006e04bb7110446265f122d9
2013-08-21 13:58:07 -07:00