PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,252 Commits 1 Branch 0 Tags
b1755b37fc3463e2a73852cd72883c56861f2597
Commit Graph

4853 Commits

Author SHA1 Message Date
Maggie Benthall
b1755b37fc am 9506d857: Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev 
* commit '9506d857cbc87a3dcedc8c3599f1d45ac6fe995e':
  Fix NPE in SecuritySettings.onResume()
 2013-08-27 17:03:31 -07:00
Maggie Benthall
9506d857cb Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev 2013-08-28 00:00:01 +00:00
Amith Yamasani
90f5d21d40 am cb6ba728: Merge "Don\'t list apps that are disabled by the system" into klp-dev 
* commit 'cb6ba728c5f872bc66e3b8ac3682b350cb7501f0':
  Don't list apps that are disabled by the system
 2013-08-27 14:45:57 -07: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
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
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
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
Chong Zhang
5114444eca Merge "wifi-display: add certification options" into klp-dev 2013-08-23 23:19:18 +00: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
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
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
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