Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,743 Commits 1 Branch 0 Tags
4be6250beed5f47b5c35d38267826b8fa7be78ea
Commit Graph

6510 Commits

Author SHA1 Message Date
Fabrice Di Meglio
4be6250bee am 3e552110: am fd45a5c6: am 56fc6a75: Merge "Code cleaning for Index" into lmp-dev 
* commit '3e552110423393020d589998bf21696f3924585a':
  Code cleaning for Index
 2014-07-24 19:59:50 +00:00
PauloftheWest
9c982871c7 am dc5db975: am ac1dedaf: am d89febb6: Merge "Fixed bug where multiple access points would show connected" into lmp-dev 
* commit 'dc5db975aaae95ec4e27d48b7748364692afa2b9':
  Fixed bug where multiple access points would show connected
 2014-07-23 22:04:54 +00:00
Alan Viverette
71a0924e24 am 7444eb54: am 8f866a5a: am 68419fca: Merge "Use activity for brightness dialog" into lmp-dev 
* commit '7444eb5475b94ac7205c0845b172f4c5b6da4880':
  Use activity for brightness dialog
 2014-07-23 22:00:15 +00:00
Dianne Hackborn
d2b634110d am 1c286fbd: am cc20a5b1: am f151ea34: Merge "Work on issue #16135174: Apps page "smoke" gradient footer must be removed" into lmp-dev 
* commit '1c286fbdae93ab09edd7493c72c7d8c42d5ce678':
  Work on issue #16135174: Apps page "smoke" gradient footer must be removed
 2014-07-23 22:00:14 +00:00
Julia Reynolds
23e921850b am 6bcd506f: am e4e607a3: am 1a0297c5: Use restrictionsprovider framework in Settings. 
* commit '6bcd506f224e4a9f0ae15873189d7838c60733ee':
  Use restrictionsprovider framework in Settings.
 2014-07-23 22:00:13 +00:00
Julia Reynolds
1a0297c544 Use restrictionsprovider framework in Settings. 
Bug: 15305103

Change-Id: Ib0147e366fe90de3512d0cc06e2a47ee16012dff
 2014-07-23 21:06:21 +00:00
Fabrice Di Meglio
12dfa2ed18 am f8af2566: am 5f71155c: am 289a63f5: Merge "Fix NotificationStation theming" into lmp-dev 
* commit 'f8af2566f22033c057b21befffc1e9801b502bb1':
  Fix NotificationStation theming
 2014-07-23 20:47:53 +00:00
Fabrice Di Meglio
d9ca152d37 am 8fc6c006: am 2f2a23de: am a79400de: Merge "Code cleaning for NotificationStation" into lmp-dev 
* commit '8fc6c006522138dca6dc72d11b2b9a51ef4ded5e':
  Code cleaning for NotificationStation
 2014-07-23 20:28:15 +00:00
Fabrice Di Meglio
d59d8d3b5e am d2bc6f45: am c95775b5: am 6cad2550: Merge "OwnerInfos code cleaning" into lmp-dev 
* commit 'd2bc6f453c6f923ddb1ac0c0d9afee9a27de8b32':
  OwnerInfos code cleaning
 2014-07-23 20:05:48 +00:00
John Spurlock
c3fc2cbf38 am 2daea077: am 5c399368: am d39d7314: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev 
* commit '2daea077674caffd34d2022cd4cd37516d919f8c':
  Settings: Wire up Display > Lift to wake.
 2014-07-23 19:36:14 +00:00
Fabrice Di Meglio
56fc6a7530 Merge "Code cleaning for Index" into lmp-dev 2014-07-23 18:56:15 +00:00
Fabrice Di Meglio
9301441e2a Code cleaning for Index 
- make that UpdateData class static

Change-Id: I22ac148613fcaa4ed3ad615c4eca037b5dc6b986
 2014-07-23 15:35:33 -07:00
Fabrice Di Meglio
9c3f11fa05 Fix NotificationStation theming 
- fix padding for the ListView
- fix ActionBar size
- remove non needed switchBarMargins

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: I0e3d3116f2ee749a04a8a464b36fa68909edf11d
 2014-07-23 13:31:26 -07:00
Fabrice Di Meglio
6e10693db5 Code cleaning for NotificationStation 
- remove dead code and vars
- log exceptions

Change-Id: Idff91c27620955a3458c2358b629331e140aedba
 2014-07-23 13:07:52 -07:00
Fabrice Di Meglio
0592a21fd8 OwnerInfos code cleaning 
Change-Id: I5f4e5dcee4af672fa11f552544bfcf4506a21258
 2014-07-23 12:45:13 -07:00
PauloftheWest
d89febb6de Merge "Fixed bug where multiple access points would show connected" into lmp-dev 2014-07-23 18:44:51 +00:00
PauloftheWest
85f545b5d9 Fixed bug where multiple access points would show connected 
Bug: 16236217
Change-Id: I0d95c753025f0787ca03876bab1fb66ec7916bf7
 2014-07-23 14:50:57 -07:00
Alan Viverette
68419fca2d Merge "Use activity for brightness dialog" into lmp-dev 2014-07-23 18:44:51 +00:00
Dianne Hackborn
f151ea3482 Merge "Work on issue #16135174: Apps page "smoke" gradient footer must be removed" into lmp-dev 2014-07-23 18:44:51 +00:00
Dianne Hackborn
fe9590bb19 Work on issue #16135174: Apps page "smoke" gradient footer must be removed 
New header in running services.  Not yet done.

Change-Id: Ibe2f4145796c7863ec80e0ea2d8d87dc910bac7e
 2014-07-23 13:50:07 -07:00
Fabrice Di Meglio
289a63f509 Merge "Fix NotificationStation theming" into lmp-dev 2014-07-23 18:44:51 +00:00
Fabrice Di Meglio
a79400defc Merge "Code cleaning for NotificationStation" into lmp-dev 2014-07-23 18:44:51 +00:00
Fabrice Di Meglio
6cad255000 Merge "OwnerInfos code cleaning" into lmp-dev 2014-07-23 18:44:51 +00:00
John Spurlock
d39d731473 Merge "Settings: Wire up Display > Lift to wake." into lmp-dev 2014-07-23 18:31:55 +00:00
John Spurlock
333efe9097 Settings: Wire up Display > Lift to wake. 
Bug:15521792
Change-Id: I1a771641ad4fc52599149ac7db4a4fe55a6b9286
 2014-07-23 13:12:50 -04:00
Julia Reynolds
7ffc385eb8 am 3e68cc9b: am 5a9e9a2e: am baffc889: Merge "Lockdown \'remove user\' with user restriction in Settings for phones." into lmp-dev 
* commit '3e68cc9bd4a48c3ee9c3cf406054ba02cc98b622':
  Lockdown 'remove user' with user restriction in Settings for phones.
 2014-07-23 15:01:36 +00:00
Paul Lawrence
39a1679373 am 56da2b97: am ff3f9cf2: am 7ae20e3c: Allow CryptKeeper dialogs to rotate on tablets 
* commit '56da2b97c2437f3410ac54333efb2325bc71b781':
  Allow CryptKeeper dialogs to rotate on tablets
 2014-07-23 14:50:18 +00:00
Paul Lawrence
7ae20e3ce9 Allow CryptKeeper dialogs to rotate on tablets 
Tablets may be used in docking stations thus need to support landscape mode.
Phones will not be, and having them rotate is both ugly and annoying.
Also this matches lock screen behavior.

The attribute screenOrientation is not themeable, so the only way of doing
this is programmatic.

Test for truth of bool which is only set for sw600dp devices and
clear the nosensor setting from the manifest if set.

Bug: 16405551
Change-Id: I5b3f945b89402e5aa39642c2c06e98f9ca1ce298
 2014-07-23 14:39:31 +00:00
Narayan Kamath
59c3da2367 Get rid of duplicated code in accessibility settings. 
Has the side effect of picking up changes to LocalePicker
that added support for 3 letter language codes.

bug: 10090157

(cherry picked from commit 26edbccb58)

Change-Id: I0f41f27e3e6eb88f0265c9ef6b3f34df04bfff1b
 2014-07-23 11:10:16 +01:00
Alan Viverette
864f98acf7 am ac029dbe: am 5329be99: am b125caa7: Merge "Remove dialog icons" into lmp-dev 
* commit 'ac029dbeb3da11bd1cd104ac7d2a4da1b4208945':
  Remove dialog icons
 2014-07-23 02:05:12 +00:00
Alan Viverette
ac029dbeb3 am 5329be99: am b125caa7: Merge "Remove dialog icons" into lmp-dev 
* commit '5329be99895530134796cfbbd510ba7fc4457182':
  Remove dialog icons
 2014-07-23 02:01:21 +00:00
John Spurlock
47ab7fc8f7 am a7a0c9a5: am 06a7fed9: am ff941af7: Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev 
* commit 'a7a0c9a51fb38385ace2d1eb404140a3daad3abe':
  Settings: Disable Interruptions > From when N/A.
 2014-07-23 01:57:23 +00:00
John Spurlock
a7a0c9a51f am 06a7fed9: am ff941af7: Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev 
* commit '06a7fed9c474d44c21074f9884ef637f7c2cf860':
  Settings: Disable Interruptions > From when N/A.
 2014-07-23 01:53:15 +00:00
Dianne Hackborn
a08ebdb376 am 81b728cc: am f23885b9: am b763e342: Improve protection against malicious admins. 
* commit '81b728ccb8b304acc36210c130ec40a76d9a86bf':
  Improve protection against malicious admins.
 2014-07-23 01:44:41 +00:00
Dianne Hackborn
81b728ccb8 am f23885b9: am b763e342: Improve protection against malicious admins. 
* commit 'f23885b92f8b80f55b17fe4072ca8ede9caadcd4':
  Improve protection against malicious admins.
 2014-07-23 01:39:46 +00:00
Dianne Hackborn
b763e34210 Improve protection against malicious admins. 
- 2 second timeout until we give up on displaying a message,
  keeping us within the 5 second activity launch block time.
- Restart the activity launch block when we show the dialog.
- Use app ops to prevent the app of the currently displayed
  admin from putting windows on top while the settings screen
  is running.

Change-Id: I631e8896ec7539c2de3ff36f183e67e36bcc37ca
 2014-07-22 18:30:26 -07:00
Alan Viverette
2eea60eb67 am 4fcd6a49: am a9653308: am 7e974f4c: Merge "Reset color space when development options are disabled" into lmp-dev 
* commit '4fcd6a49ed297a20ebe6f1f31216743c6eb23b40':
  Reset color space when development options are disabled
 2014-07-23 00:37:24 +00:00
Alan Viverette
4fcd6a49ed am a9653308: am 7e974f4c: Merge "Reset color space when development options are disabled" into lmp-dev 
* commit 'a9653308e4001150191e0107ceffe7bfd3abf88b':
  Reset color space when development options are disabled
 2014-07-23 00:33:20 +00:00
John Spurlock
c0f5b2747a am 7d726417: am 58c891e8: am 54612391: Settings: Tweak zen alarm info string. 
* commit '7d726417af43b9c5bf5fc795a62f4a56d56220ff':
  Settings: Tweak zen alarm info string.
 2014-07-23 00:13:12 +00:00
John Spurlock
7d726417af am 58c891e8: am 54612391: Settings: Tweak zen alarm info string. 
* commit '58c891e8ba5bd927c7f85ebe7abe4dad81f16769':
  Settings: Tweak zen alarm info string.
 2014-07-23 00:10:18 +00:00
Jeff Sharkey
661e854434 am d9e82576: am 13948a69: am e65bb492: Merge "Data Usage, materialized!" into lmp-dev 
* commit 'd9e825763e2f612f8f3515f958e1e2b4f84d31d5':
  Data Usage, materialized!
 2014-07-22 23:53:32 +00:00
John Spurlock
5461239187 Settings: Tweak zen alarm info string. 
Use standard styling and remove the bit about timers.

Bug:16487906
Change-Id: I28b8ac61981a2e9956d41768ee1185dc5ad950f3
 2014-07-22 19:51:40 -04:00
Jeff Sharkey
d9e825763e am 13948a69: am e65bb492: Merge "Data Usage, materialized!" into lmp-dev 
* commit '13948a69f4c68b38ff46f7cc3127ddbfffbf00aa':
  Data Usage, materialized!
 2014-07-22 23:49:25 +00:00
PauloftheWest
9de00da82f am b29e0751: am ca6d88aa: am 0da1f851: Removed WPA PSK from HotSpot Options 
* commit 'b29e0751d3984b8da729587f74aac43168e824bc':
  Removed WPA PSK from HotSpot Options
 2014-07-22 23:49:11 +00:00
PauloftheWest
b29e0751d3 am ca6d88aa: am 0da1f851: Removed WPA PSK from HotSpot Options 
* commit 'ca6d88aac96171adab56d51cea9bc315c9966948':
  Removed WPA PSK from HotSpot Options
 2014-07-22 23:45:14 +00:00
Alan Viverette
5510a9e640 am 3322a5e5: am 26eaa31c: am 47d27bd6: Merge "Stop using framework-private switch asset" into lmp-dev 
* commit '3322a5e50a3831cf71ae5894a96a69c3151ae033':
  Stop using framework-private switch asset
 2014-07-22 23:40:18 +00:00
Alan Viverette
3322a5e50a am 26eaa31c: am 47d27bd6: Merge "Stop using framework-private switch asset" into lmp-dev 
* commit '26eaa31cf100f22050bee0780264a3e6c40c1dac':
  Stop using framework-private switch asset
 2014-07-22 23:33:44 +00:00
PauloftheWest
0da1f8515a Removed WPA PSK from HotSpot Options 
Bug: 16380972
Change-Id: I77735ff7a8962d538132bb55ebbf6cc75358f8a1
 2014-07-22 23:31:27 +00:00
Fabrice Di Meglio
d3af3937d6 am 0c634a11: am 4ad8602a: am 3f3426e0: Merge "Add Home / Launcher apps indexing" into lmp-dev 
* commit '0c634a11a8a86fe0ccde7ddd839a3b00a34c12fd':
  Add Home / Launcher apps indexing
 2014-07-22 22:29:11 +00:00
Fabrice Di Meglio
0c634a11a8 am 4ad8602a: am 3f3426e0: Merge "Add Home / Launcher apps indexing" into lmp-dev 
* commit '4ad8602ac358672f7f1b162930eccb7e96e223f5':
  Add Home / Launcher apps indexing
 2014-07-22 22:24:58 +00:00