Baligh Uddin
da1f8abda6
am f7b5ad80: (-s ours) am da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f7b5ad80a8e31d717ffed1a0b7a1403c3bf75cd1':
Import translations. DO NOT MERGE
2013-08-29 07:59:30 -07:00
Baligh Uddin
f7b5ad80a8
am da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE
...
* commit 'da7395d6c5a92738c2e7130590f30a536ec94b54':
Import translations. DO NOT MERGE
2013-08-29 07:57:04 -07:00
Baligh Uddin
0aad980170
am 439b1543: (-s ours) am 17d0af91: (-s ours) Import translations. DO NOT MERGE
...
* commit '439b1543119fd97d134c602d92fc6ce9a517be20':
Import translations. DO NOT MERGE
2013-08-29 07:56:04 -07:00
Baligh Uddin
da7395d6c5
am c7902845: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c79028454106f4e73702c4bd4dde36a37beca90c':
Import translations. DO NOT MERGE
2013-08-29 07:53:56 -07:00
Baligh Uddin
439b154311
am 17d0af91: (-s ours) Import translations. DO NOT MERGE
...
* commit '17d0af9160697f0fcb2d33ed4b4e91ad6769141c':
Import translations. DO NOT MERGE
2013-08-29 07:53:47 -07:00
Baligh Uddin
02f3f2028f
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-08-29 14:50:25 +00:00
The Android Automerger
a8bc1510d0
merge in klp-release history after reset to klp-dev
2013-08-29 06:01:30 -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
Baligh Uddin
17d0af9160
Import translations. DO NOT MERGE
...
Change-Id: I2373253c983b6298e17d38882fc85ada1fd2e6e2
Auto-generated-cl: translation import
2013-08-28 23:33:19 -07:00
Baligh Uddin
c790284541
Import translations. DO NOT MERGE
...
Change-Id: I7e0a050642f956f175dcb349945089b4515c1bb5
Auto-generated-cl: translation import
2013-08-28 23:32:03 -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
Amith Yamasani
6760f92321
Merge "Fix RTL layout of text in Battery history screen" into klp-dev
2013-08-29 01:04:11 +00:00
Lifu Tang
3d0bee59b8
Fixed the widget location toggle button
...
- Fix b/10531669
Change-Id: Iba08d515119c42e5c4de4ee02d6dd8aea404fc69
2013-08-28 17:01:43 -07:00
Lifu Tang
dcf2509e75
Merge "Disallows setting when user restriction applies" into klp-dev
2013-08-28 22:29:55 +00:00
Amith Yamasani
74809c2679
Fix RTL layout of text in Battery history screen
...
Change the anchor position and alignment direction for text.
Bug: 10447666
Change-Id: Ida4161c738cf9a32cc8ff98037f3755046e64e33
2013-08-28 15:14:16 -07:00
Amith Yamasani
079c412def
Merge "Add more fragments to valid list for Wifi activity" into klp-dev
2013-08-28 21:52:59 +00:00
Wink Saville
bb77bf22d5
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
...
Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
2013-08-28 14:26:27 -07:00
Lifu Tang
4fb17c1c98
Disallows setting when user restriction applies
...
- Fix b/10116533
Change-Id: Ib171f9545c1651fb36c408decefa47b3d82ba3ab
2013-08-28 13:41:20 -07:00
Amith Yamasani
85654787eb
Add more fragments to valid list for Wifi activity
...
Bug: 10508371
Change-Id: Ic2d2128433ae26ea6750281b978781cb56b97036
2013-08-28 12:38:46 -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
The Android Automerger
f7e933aa1a
merge in klp-release history after reset to klp-dev
2013-08-28 06:01:13 -07:00
Baligh Uddin
8df4caf168
am d866be38: (-s ours) am 1caeb5a1: (-s ours) am d8c9c146: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd866be382b330ae6c96dfe0de66f2426945b7730':
Import translations. DO NOT MERGE
2013-08-27 19:42:22 -07:00
Baligh Uddin
d866be382b
am 1caeb5a1: (-s ours) am d8c9c146: (-s ours) Import translations. DO NOT MERGE
...
* commit '1caeb5a11d4846c5db9741c914b1ba53b0af6dc9':
Import translations. DO NOT MERGE
2013-08-27 19:40:21 -07:00
Baligh Uddin
26a4b208ef
am 56fc8b77: (-s ours) am 04a25289: (-s ours) Import translations. DO NOT MERGE
...
* commit '56fc8b77643411ca8c43b0f3d178c3804de7093b':
Import translations. DO NOT MERGE
2013-08-27 19:39:03 -07:00
Baligh Uddin
56fc8b7764
am 04a25289: (-s ours) Import translations. DO NOT MERGE
...
* commit '04a252899bdd8a798d1a9c90c2ab45f9efdba5a8':
Import translations. DO NOT MERGE
2013-08-27 19:37:03 -07:00
Baligh Uddin
1caeb5a11d
am d8c9c146: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd8c9c146e79636f44808e2514e666f0966cc5596':
Import translations. DO NOT MERGE
2013-08-27 19:36:48 -07:00
Baligh Uddin
f92ee42545
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-08-28 02:34:25 +00:00
Maggie Benthall
9506d857cb
Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev
2013-08-28 00:00:01 +00:00
Amith Yamasani
cb6ba728c5
Merge "Don't list apps that are disabled by the system" into klp-dev
2013-08-27 21:42:58 +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
Tom O'Neill
9066b9140c
Merge "Switch to new location mode API recommended by API council" into klp-dev
2013-08-27 15:48:34 +00:00
Tom O'Neill
5d821bedb1
Merge "Adapt to SettingsInjectorService API changes" into klp-dev
2013-08-27 14:38:07 +00:00
The Android Automerger
61ad29ae12
merge in klp-release history after reset to klp-dev
2013-08-27 06:02:13 -07:00
Tom O'Neill
93259c14f3
Switch to new location mode API recommended by API council
...
- Part of b/10461763 fix
Change-Id: I202ce4c817f24a1682796e92fed9cc3efcc31a81
2013-08-26 14:40:54 -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
Baligh Uddin
04a252899b
Import translations. DO NOT MERGE
...
Change-Id: I46db6a6657e5528bbb4a84187f9b271baf644843
Auto-generated-cl: translation import
2013-08-26 13:55:54 -07:00
Baligh Uddin
d8c9c146e7
Import translations. DO NOT MERGE
...
Change-Id: Iddf40541878ef237a1890dad5c3d16e4132d6dde
Auto-generated-cl: translation import
2013-08-26 13:54:28 -07:00
Alan Viverette
0f9a405fd5
Fix APN preference style
...
BUG: 10445477
Change-Id: Ie1ce786ce49e1b68ffd38f6908189b8241773838
2013-08-26 13:25:59 -07:00
Tom O'Neill
b578ac4f94
Adapt to SettingsInjectorService API changes
...
- Part of fix for b/10461474
Change-Id: Ia37f444afc822a42ec21ebd2beae7aef8642547a
2013-08-26 09:47:55 -07:00
Tom O'Neill
cbf589e73c
Merge "Handle races caused by rapid settings changed broadcasts" into klp-dev
2013-08-26 14:33:38 +00:00
The Android Automerger
f340397c25
merge in klp-release history after reset to klp-dev
2013-08-26 06:01:38 -07:00
Jim Miller
f6794f95d1
Merge "Add setting to disable keyguard widgets" into klp-dev
2013-08-24 01:28:40 +00:00
Amith Yamasani
2a5707874b
Merge "Fix incorrect comparison" into klp-dev
2013-08-24 01:23:06 +00:00
Amith Yamasani
39272d07d7
Fix incorrect comparison
...
Bug: 10446469
Screen lock options should have been locked down when encryption is
enabled. An incorrect comparison (== instead of equals) caused it
to always bypass encryption quality check.
Change-Id: I7f3856146181a92183555f30bbc50d58bfe0c3d5
2013-08-23 18:07:30 -07:00
Lifu Tang
85dfc9009f
Merge "Allows multi-line message on small-screen devices" into klp-dev
2013-08-24 00:00:36 +00:00
Baligh Uddin
0f0752650c
Import translations. DO NOT MERGE
...
Change-Id: I1680219b7f4f2e9d71bb901d7708ef6eb153cfb6
Auto-generated-cl: translation import
Conflicts:
res/values-af/strings.xml
res/values-am/strings.xml
res/values-ar/arrays.xml
res/values-ar/strings.xml
res/values-az/strings.xml
res/values-be/strings.xml
res/values-bg/arrays.xml
res/values-bg/strings.xml
res/values-ca/arrays.xml
res/values-ca/strings.xml
res/values-cs/arrays.xml
res/values-cs/strings.xml
res/values-da/arrays.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-en-rGB/strings.xml
res/values-en-rIN/strings.xml
res/values-es-rUS/arrays.xml
res/values-es-rUS/strings.xml
res/values-es/arrays.xml
res/values-es/strings.xml
res/values-fa/arrays.xml
res/values-fa/strings.xml
res/values-fi/strings.xml
res/values-fr-rCA/arrays.xml
res/values-fr-rCA/strings.xml
res/values-fr/arrays.xml
res/values-fr/strings.xml
res/values-hi/strings.xml
res/values-hr/arrays.xml
res/values-hr/strings.xml
res/values-hu/strings.xml
res/values-in/arrays.xml
res/values-in/strings.xml
res/values-it/strings.xml
res/values-iw/arrays.xml
res/values-iw/strings.xml
res/values-ja/arrays.xml
res/values-ja/strings.xml
res/values-ko/arrays.xml
res/values-ko/strings.xml
res/values-lt/arrays.xml
res/values-lt/strings.xml
res/values-lv/arrays.xml
res/values-lv/strings.xml
res/values-mn/strings.xml
res/values-nb/strings.xml
res/values-nl/strings.xml
res/values-pl/arrays.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-rm/strings.xml
res/values-ro/arrays.xml
res/values-ro/strings.xml
res/values-ru/arrays.xml
res/values-ru/strings.xml
res/values-sk/arrays.xml
res/values-sk/strings.xml
res/values-sl/strings.xml
res/values-sr/arrays.xml
res/values-sr/strings.xml
res/values-sv/arrays.xml
res/values-sv/strings.xml
res/values-sw/arrays.xml
res/values-sw/strings.xml
res/values-th/arrays.xml
res/values-th/strings.xml
res/values-tl/arrays.xml
res/values-tl/strings.xml
res/values-tr/arrays.xml
res/values-tr/strings.xml
res/values-uk/strings.xml
res/values-vi/arrays.xml
res/values-vi/strings.xml
res/values-zh-rCN/arrays.xml
res/values-zh-rCN/strings.xml
res/values-zh-rHK/arrays.xml
res/values-zh-rHK/strings.xml
res/values-zh-rTW/arrays.xml
res/values-zh-rTW/strings.xml
res/values-zu/arrays.xml
res/values-zu/strings.xml
2013-08-23 16:45:56 -07: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
Tom O'Neill
e17ce5fb73
Handle races caused by rapid settings changed broadcasts
...
- Fix b/10447517
Change-Id: I63ef98c9023cee1a15be61b966aed06dc35e9bd5
2013-08-23 15:23:12 -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
