Commit Graph

11246 Commits

Author SHA1 Message Date
Tom O'Neill
ca51ca84f6 am 9066b914: Merge "Switch to new location mode API recommended by API council" into klp-dev
* commit '9066b9140c376cb1b66a3eee830d9dfa177c6056':
  Switch to new location mode API recommended by API council
2013-08-27 08:51:04 -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
4d6aaf30ea am 5d821bed: Merge "Adapt to SettingsInjectorService API changes" into klp-dev
* commit '5d821bedb1f065702b9920fe15a6f81bc19ba36b':
  Adapt to SettingsInjectorService API changes
2013-08-27 07:42:52 -07:00
Tom O'Neill
5d821bedb1 Merge "Adapt to SettingsInjectorService API changes" into klp-dev 2013-08-27 14:38:07 +00:00
Alan Viverette
14983f099c am 0f9a405f: Fix APN preference style
* commit '0f9a405fd58f8f5d30fbbe975e063e324d46a1f2':
  Fix APN preference style
2013-08-26 15:05:38 -07:00
Tom O'Neill
0af71e25f3 am cbf589e7: Merge "Handle races caused by rapid settings changed broadcasts" into klp-dev
* commit 'cbf589e73cd8b9a62c413c804b698e489f44c403':
  Handle races caused by rapid settings changed broadcasts
2013-08-26 15:03:54 -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
Amith Yamasani
23f4337ba4 am 2a570787: Merge "Fix incorrect comparison" into klp-dev
* commit '2a5707874b6ec39798421f77e0ccf38dbaa1e65f':
  Fix incorrect comparison
2013-08-26 15:03:22 -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
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
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
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
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
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
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
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
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
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
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
81eab3f04a Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-22 17:52:33 +00: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
a99ec98710 am 9fb0ab85: Merge "Update power widget to represent gps instead of location master." into klp-dev
* commit '9fb0ab85a2a6fba39a19d86361f31a693163402a':
  Update power widget to represent gps instead of location master.
2013-08-21 21:17:53 -07:00
David Christie
9fb0ab85a2 Merge "Update power widget to represent gps instead of location master." into klp-dev 2013-08-22 04:14:56 +00:00
Jonathan Dixon
ba0ef659e1 Add an Are you Sure to experiemental webview
Bug: 10427705

Not bothering to translate strings as this will be deleted soon

Change-Id: I26721e606649d267d1b6507bc1a16ce91a63276a
2013-08-21 17:49:59 -07:00
David Christie
5eed792a76 Update power widget to represent gps instead of location master.
Change-Id: I62f701b612db2e31f9ad8b016dbf37ed7fd4ef26
2013-08-21 17:18:51 -07:00
Lifu Tang
0edf8ecbd6 am 25518c3b: Sort "Location services" alphabetically
* commit '25518c3b45827537b2b2c2b35fdc86bc8bd60502':
  Sort "Location services" alphabetically
2013-08-21 17:06:44 -07:00
Lifu Tang
25518c3b45 Sort "Location services" alphabetically
* Sort "Location services" items by title

* Throttle the rate of loading status messages

Change-Id: Iecb039a4ab94a810e11ef3e426e4a4b5c8c75c37
2013-08-21 16:52:14 -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
Baligh Uddin
f23da91e52 Import translations. DO NOT MERGE
Change-Id: Iac08e7012b0da2da09077d0eaeda93b42473d14f
Auto-generated-cl: translation import
2013-08-21 16:04:35 -07:00