Commit Graph

4833 Commits

Author SHA1 Message Date
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
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
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
Chong Zhang
5114444eca Merge "wifi-display: add certification options" into klp-dev 2013-08-23 23:19:18 +00: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
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
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
David Christie
4bc8e50bee am ae95da41: Merge "Switch location Settings and Power widget to use new Settings api." into klp-dev
* commit 'ae95da417ce5c88127ae806994491a49885066ab':
  Switch location Settings and Power widget to use new Settings api.
2013-08-21 10:45:08 -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
12c7f185e3 am 9facc23c: Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev
* commit '9facc23cd8341d579c44af51a2be87effee8618e':
  Move UPDATE_INTENT to SettingsInjectorService
2013-08-21 07:55:42 -07:00
Tom O'Neill
9facc23cd8 Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev 2013-08-21 14:53:19 +00:00
Alan Viverette
16ad25665e am bffd631a: Allow the framework to recycle ApnPreference views
* commit 'bffd631a2ab08c4313ae6405b9a8803bc98b629b':
  Allow the framework to recycle ApnPreference views
2013-08-20 19:00:32 -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
976590843a am 35bac199: Merge "Fix background and line wrapping in CaptionTextView" into klp-dev
* commit '35bac199324d07dd6cf16e3bd50df1feca8e9030':
  Fix background and line wrapping in CaptionTextView
2013-08-20 16:50:04 -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
8551bcf59c am 0f5578ce: Merge "Select max timeout, if it\'s in the timeout list" into klp-dev
* commit '0f5578ce2ddfc19eab36e843728470e8119026b5':
  Select max timeout, if it's in the timeout list
2013-08-20 13:35:29 -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
Lifu Tang
96dd39badd am d3dbc6e3: Launches the Location setting as fragment
* commit 'd3dbc6e3a187b9de69b83915400425032d287dec':
  Launches the Location setting as fragment
2013-08-19 19:01:08 -07:00
Lifu Tang
d3dbc6e3a1 Launches the Location setting as fragment
Change-Id: I0fb04a346236676ce9483a0c4d1fc3b2b590b08c
2013-08-19 18:42:56 -07:00
Lifu Tang
2e45637aeb am b9ab196b: Sort recent apps, show message when no recent apps
* commit 'b9ab196bb520fed9b23aa9a259fab08084646c2c':
  Sort recent apps, show message when no recent apps
2013-08-19 18:33:08 -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
0acf3cfc8c am dbd2f759: Merge "Supress Location button when coming from Location" into klp-dev
* commit 'dbd2f7592943f49dd8227f01fa9c5d14e4e58c0b':
  Supress Location button when coming from Location
2013-08-19 14:37:09 -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
88d83a901f am c7679b0e: Merge "Don\'t crash when procstats has data for a now-disused uid" into klp-dev
* commit 'c7679b0ef23fb137266c8ad03312bddbd807a87b':
  Don't crash when procstats has data for a now-disused uid
2013-08-19 14:20:50 -07: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
Christopher Tate
a218e732b0 Don't crash when procstats has data for a now-disused uid
That is, PackageManager.getPackagesForUid(uid) can return null,
so deal with it.

Bug 10374656

Change-Id: I4eacd48c809b778e131d37dba0e86c583553e41f
2013-08-18 17:26:48 -07:00
Amith Yamasani
78b8265b17 Select max timeout, if it's in the timeout list
Bug: 10192592
Change-Id: I21ec208abf0c8659233cdb5219d9b226528aa1d4
2013-08-16 16:35:54 -07:00
Amith Yamasani
905c00a405 am 55fe056d: Merge "Don\'t apply encryption password requirements for secondary users" into klp-dev
* commit '55fe056d96bdb683dce0a4e66e7390d19f23e710':
  Don't apply encryption password requirements for secondary users
2013-08-15 18:09:06 -07:00
Amith Yamasani
55fe056d96 Merge "Don't apply encryption password requirements for secondary users" into klp-dev 2013-08-16 01:04:51 +00:00
Zhihai Xu
97fb8dbbe8 am 3d74aeaa: Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev
* commit '3d74aeaa85285425fc5f20cf93f615a4ead6d2fd':
  LE: Add support for the HID-over-GATT profile (3/3)
2013-08-15 17:24:54 -07:00