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
85e494ae85
am a0aee43e
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a0aee43e8463516ded9b3ab784d53bdf9ccf87c2':
Import translations. DO NOT MERGE
2013-08-26 15:00:50 -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
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
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
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
76a343199c
am c387fee5
: am 32e016b5
: Reloads status messages for injected items
...
* commit 'c387fee53df217ea11b6e532d0f178b71a2757fe':
Reloads status messages for injected items
2013-08-22 18:30:04 -07:00
Lifu Tang
c387fee53d
am 32e016b5
: Reloads status messages for injected items
...
* commit '32e016b5fae1f4caf673ff1f062869dce0e94757':
Reloads status messages for injected items
2013-08-22 18:26:49 -07:00
Lifu Tang
32e016b5fa
Reloads status messages for injected items
...
Change-Id: I6bb95c4b7ff4118074fb51aeed31596eab1e7eef
2013-08-22 18:08:18 -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
Amith Yamasani
80f8d987c9
am c2e6a4c6
: am 8c89872a
: Merge "Fix custom restrictions launch mechanism" into klp-dev
...
* commit 'c2e6a4c69610caa62241532c209b1d213eb7455e':
Fix custom restrictions launch mechanism
2013-08-22 11:13:09 -07:00
Amith Yamasani
c2e6a4c696
am 8c89872a
: Merge "Fix custom restrictions launch mechanism" into klp-dev
...
* commit '8c89872a21859f413c139b232ee31d004fe24ebb':
Fix custom restrictions launch mechanism
2013-08-22 11:10:07 -07:00
Baligh Uddin
8c594fdbb6
am cd80f4f1
: (-s ours) am 6c523b73
: (-s ours) am 06de3680
: (-s ours) am 56c597c1
: (-s ours) am bf65bf49
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cd80f4f103b9ca74a6173be65689a0490e0fd05b':
Import translations. DO NOT MERGE
2013-08-22 11:09:45 -07:00
Amith Yamasani
8c89872a21
Merge "Fix custom restrictions launch mechanism" into klp-dev
2013-08-22 18:06:59 +00:00
Baligh Uddin
cd80f4f103
am 6c523b73
: (-s ours) am 06de3680
: (-s ours) am 56c597c1
: (-s ours) am bf65bf49
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6c523b73c70cd8a45549d233bd1d81c0f8867110':
Import translations. DO NOT MERGE
2013-08-22 11:06:40 -07:00
Baligh Uddin
cb7ac5abc0
am f0acba59
: (-s ours) am e863b94b
: (-s ours) am f3381a80
: (-s ours) am f23da91e
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f0acba598a70dc02242519a93580638701b13caa':
Import translations. DO NOT MERGE
2013-08-22 11:05:52 -07:00
Baligh Uddin
f0acba598a
am e863b94b
: (-s ours) am f3381a80
: (-s ours) am f23da91e
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e863b94badec0f73a0a5d8503bbf3606025d0973':
Import translations. DO NOT MERGE
2013-08-22 11:02:57 -07:00
Baligh Uddin
6c523b73c7
am 06de3680
: (-s ours) am 56c597c1
: (-s ours) am bf65bf49
: (-s ours) Import translations. DO NOT MERGE
...
* commit '06de3680673eef2ac62dd4e17bb5ce118e88d5aa':
Import translations. DO NOT MERGE
2013-08-22 11:02:26 -07:00
Baligh Uddin
e863b94bad
am f3381a80
: (-s ours) am f23da91e
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f3381a80bd97af42c17bbcc5470804b5c6ada191':
Import translations. DO NOT MERGE
2013-08-22 10:59:08 -07:00
Baligh Uddin
06de368067
am 56c597c1
: (-s ours) am bf65bf49
: (-s ours) Import translations. DO NOT MERGE
...
* commit '56c597c1b3c5a7d7d2f4e6e26c76c77b9e36120e':
Import translations. DO NOT MERGE
2013-08-22 10:59:01 -07:00
Baligh Uddin
427b117aac
am c4db9d7c
: (-s ours) am 81eab3f0
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'c4db9d7ca9b3a35c3bf832abb2f9dadc3c18beda':
Import translations. DO NOT MERGE
2013-08-22 10:58:53 -07:00
Baligh Uddin
c4db9d7ca9
am 81eab3f0
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '81eab3f04a8daacbb0a771229ccb44338ea00747':
Import translations. DO NOT MERGE
2013-08-22 10:55:51 -07:00
Baligh Uddin
56c597c1b3
am bf65bf49
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bf65bf49cba2addbcfef81dcea87b27593b9e083':
Import translations. DO NOT MERGE
2013-08-22 10:55:45 -07:00
Baligh Uddin
f3381a80bd
am f23da91e
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f23da91e52169b920fb21a10ff76d617117d5f95':
Import translations. DO NOT MERGE
2013-08-22 10:55:44 -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
The Android Automerger
41e063eac2
merge in klp-release history after reset to klp-dev
2013-08-22 06:01:56 -07:00
Jonathan Dixon
4ea1ce4713
am d0780fce
: am f3267d9f
: Merge "Add an Are you Sure to experiemental webview" into klp-dev
...
* commit 'd0780fcedaa3f6a8cf8f8c02cbe3fc6f11b71c43':
Add an Are you Sure to experiemental webview
2013-08-21 22:04:29 -07:00
Jonathan Dixon
d0780fceda
am f3267d9f
: Merge "Add an Are you Sure to experiemental webview" into klp-dev
...
* commit 'f3267d9fee8f2dd675d66b00a566da06717f8664':
Add an Are you Sure to experiemental webview
2013-08-21 22:02:52 -07:00
Jonathan Dixon
f3267d9fee
Merge "Add an Are you Sure to experiemental webview" into klp-dev
2013-08-22 05:00:20 +00:00
David Christie
277bfa942a
am a99ec987
: am 9fb0ab85
: Merge "Update power widget to represent gps instead of location master." into klp-dev
...
* commit 'a99ec987105a31d156b7170c872811d206706f72':
Update power widget to represent gps instead of location master.
2013-08-21 21:19:28 -07:00