Commit Graph

11333 Commits

Author SHA1 Message Date
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
32e016b5fa Reloads status messages for injected items
Change-Id: I6bb95c4b7ff4118074fb51aeed31596eab1e7eef
2013-08-22 18:08:18 -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
8c89872a21 Merge "Fix custom restrictions launch mechanism" into klp-dev 2013-08-22 18:06:59 +00: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
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
f3267d9fee Merge "Add an Are you Sure to experiemental webview" into klp-dev 2013-08-22 05:00:20 +00: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
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
Baligh Uddin
bf65bf49cb Import translations. DO NOT MERGE
Change-Id: Idc054aa50da72b31b8c75270bff2739ef541af01
Auto-generated-cl: translation import
2013-08-21 16:03:04 -07:00
Alan Viverette
e873aeb3a6 Update caption preferences to use SubtitleView
Change-Id: I02230669c5e7be36006e04bb7110446265f122d9
2013-08-21 13:58:07 -07:00
Romain Guy
821496bf4a Add Deuteranomaly color set to overdraw debugging
Change-Id: I27e48f54653f24383ab85c0e500fdd79cec28cc3
2013-08-21 11:54:29 -07:00
David Christie
ae95da417c Merge "Switch location Settings and Power widget to use new Settings api." into klp-dev 2013-08-21 17:40:56 +00:00
Tom O'Neill
9facc23cd8 Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev 2013-08-21 14:53:19 +00:00
Jim Miller
ef3e701b78 Add setting to disable keyguard widgets
This allows disabling keyguard widgets through Settings.
On new devices, the setting is turned off by default.  If the
user currently has widgets in keyguard, then we keep them
and re-enable the setting.

Change-Id: I25f0756ac72227e13dcb491694b3ec3c2bf1d293
2013-08-20 19:03:30 -07:00
Alan Viverette
bffd631a2a Allow the framework to recycle ApnPreference views
BUG: 10079104
Change-Id: Iaa4f155da12a141f16300076cc820d47e0c5779a
2013-08-20 18:14:33 -07:00
Alan Viverette
35bac19932 Merge "Fix background and line wrapping in CaptionTextView" into klp-dev 2013-08-20 23:46:20 +00:00
Amith Yamasani
d760a61936 Fix custom restrictions launch mechanism
Instead of showing a separate entry for launching custom restrictions,
launch it directly when clicking on the settings icon.

Bug: 10388399
Change-Id: I327d6d4c2b9840ce5ba140746568c5561a1a8936
2013-08-20 16:26:48 -07:00
Alan Viverette
c30f124c91 Fix background and line wrapping in CaptionTextView
Also fixes where two style names were accidentally switched,
makes the font sizes larger, and cleans up the CaptionTextView
styling APIs in preparation for moving it into the framework.

BUG: 10396663
Change-Id: I00999723a67bce2659d913b70dd4420ed32f955c
2013-08-20 15:58:38 -07:00
David Christie
512183ea8e Switch location Settings and Power widget to use new Settings api.
Change-Id: I06b7a2e21876a18d9ad42fda2a6c6d4c7b6add48
2013-08-20 15:24:21 -07:00
Amith Yamasani
0f5578ce2d Merge "Select max timeout, if it's in the timeout list" into klp-dev 2013-08-20 20:33:24 +00:00
Maggie Benthall
f48206e37e Fix NPE in SecuritySettings.onResume()
when DISALLOW_CONFIG_CREDENTIALS is true.

Bug: 10405192
Change-Id: Id364ba3cd86151b504158bc253559d0da5e26273
2013-08-20 11:03:05 -04:00
Lifu Tang
d3dbc6e3a1 Launches the Location setting as fragment
Change-Id: I0fb04a346236676ce9483a0c4d1fc3b2b590b08c
2013-08-19 18:42:56 -07:00
Lifu Tang
b9ab196bb5 Sort recent apps, show message when no recent apps
Change-Id: I70bb1913435b46fc87aec10075e43f98ef07ef62
2013-08-19 17:56:14 -07:00
Lifu Tang
dbd2f75929 Merge "Supress Location button when coming from Location" into klp-dev 2013-08-19 21:33:22 +00:00
Christopher Tate
c7679b0ef2 Merge "Don't crash when procstats has data for a now-disused uid" into klp-dev 2013-08-19 21:19:11 +00:00
Lifu Tang
bfa96c3b10 Supress Location button when coming from Location
Change-Id: Ie1f1aed17206530ec7c8a1cde43a4380b7232823
2013-08-19 14:15:52 -07:00
Tom O'Neill
4a70f652ad Move UPDATE_INTENT to SettingsInjectorService
Change-Id: I657c799b791e49e4af097f3cc4afdaa8f48325ac
2013-08-19 13:13:25 -07:00
Baligh Uddin
6a5c9a83d6 am 1df37ff1: (-s ours) am 2b851859: (-s ours) am b09878b8: (-s ours) Import translations. DO NOT MERGE
* commit '1df37ff1b1761ed6124e1ff1abcfb4c0d60f6c77':
  Import translations. DO NOT MERGE
2013-08-19 13:09:43 -07:00
Baligh Uddin
05e3f62747 am 5c601791: (-s ours) am 8485f115: (-s ours) Import translations. DO NOT MERGE
* commit '5c601791074c2275bd42ad8c6798ef39b13e0a6d':
  Import translations. DO NOT MERGE
2013-08-19 13:06:15 -07:00
Baligh Uddin
b0130e7b9c am 21cbd017: (-s ours) am e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE
* commit '21cbd017a3201639097cda31c59f769d1cc2b739':
  Import translations. DO NOT MERGE
2013-08-19 13:06:14 -07:00
Baligh Uddin
1df37ff1b1 am 2b851859: (-s ours) am b09878b8: (-s ours) Import translations. DO NOT MERGE
* commit '2b85185988eec44b6fdd3ee072d44b0a7a72d432':
  Import translations. DO NOT MERGE
2013-08-19 13:04:58 -07:00