PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,563 Commits 1 Branch 0 Tags
2d8392b7ce11a9691e34092f16a8740fe89b5f8c
Commit Graph

15563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a8e0a5b5f9 Merge "Settings: Add to the zen alarm string." into lmp-dev 2014-07-23 18:31:55 +00:00
John Spurlock
1b821ffad4 Settings: Add to the zen alarm string. 
Bug:16406214
Change-Id: I9112c93fdee847633f9e5fb79129a3b02af4439e
 2014-07-24 11:24:18 -04:00
John Spurlock
d39d731473 Merge "Settings: Wire up Display > Lift to wake." into lmp-dev 2014-07-23 18:31:55 +00:00
PauloftheWest
ff154d9902 am fc98ff5c: am b6e74d86: am 564282a3: Merge "Character limit updates" into lmp-dev 
* commit 'fc98ff5c9f160f6e2c754e548b37f73c0a272b4d':
  Character limit updates
 2014-07-23 17:30:59 +00:00
PauloftheWest
fc98ff5c9f am b6e74d86: am 564282a3: Merge "Character limit updates" into lmp-dev 
* commit 'b6e74d867cc966ea80e6f0e7fbecda635a3bc5b0':
  Character limit updates
 2014-07-23 17:24:11 +00:00
PauloftheWest
b6e74d867c am 564282a3: Merge "Character limit updates" into lmp-dev 
* commit '564282a3f4645cf50aedd3cc809debe4f77a586b':
  Character limit updates
 2014-07-23 17:19:43 +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
Julia Reynolds
3e68cc9bd4 am 5a9e9a2e: am baffc889: Merge "Lockdown \'remove user\' with user restriction in Settings for phones." into lmp-dev 
* commit '5a9e9a2ebd2deee9a3b3fea11e8639ee00a1c62f':
  Lockdown 'remove user' with user restriction in Settings for phones.
 2014-07-23 14:58:10 +00:00
Julia Reynolds
5a9e9a2ebd am baffc889: Merge "Lockdown \'remove user\' with user restriction in Settings for phones." into lmp-dev 
* commit 'baffc8892440bcdf43c90aa74e301bd3d16a795a':
  Lockdown 'remove user' with user restriction in Settings for phones.
 2014-07-23 14:54:04 +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
56da2b97c2 am ff3f9cf2: am 7ae20e3c: Allow CryptKeeper dialogs to rotate on tablets 
* commit 'ff3f9cf279bcfaab8597fcbaaa22dabc8c0f497d':
  Allow CryptKeeper dialogs to rotate on tablets
 2014-07-23 14:46:41 +00:00
Paul Lawrence
ff3f9cf279 am 7ae20e3c: Allow CryptKeeper dialogs to rotate on tablets 
* commit '7ae20e3ce98543888cfccbef6b1254d060bc30ca':
  Allow CryptKeeper dialogs to rotate on tablets
 2014-07-23 14:43:36 +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
2dea5d5c30 am 56a442b0: am 5f4ba131: am 59c3da23: Get rid of duplicated code in accessibility settings. 
* commit '56a442b0833df11a87c05a24c6c380b2b10df4a9':
  Get rid of duplicated code in accessibility settings.
 2014-07-23 13:26:56 +00:00
Narayan Kamath
56a442b083 am 5f4ba131: am 59c3da23: Get rid of duplicated code in accessibility settings. 
* commit '5f4ba1315ea6e8936cae63269ab83e6851b78489':
  Get rid of duplicated code in accessibility settings.
 2014-07-23 13:05:07 +00:00
Narayan Kamath
5f4ba1315e am 59c3da23: Get rid of duplicated code in accessibility settings. 
* commit '59c3da2367bad63efd71753b4d1ad88f2298ddc6':
  Get rid of duplicated code in accessibility settings.
 2014-07-23 12:51:29 +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
Alan Viverette
5329be9989 am b125caa7: Merge "Remove dialog icons" into lmp-dev 
* commit 'b125caa7ed29f1ecf5062452191d061fa890decb':
  Remove dialog icons
 2014-07-23 01:56:41 +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
John Spurlock
06a7fed9c4 am ff941af7: Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev 
* commit 'ff941af733a86c4b9fdf1f7f23ac6405faf73231':
  Settings: Disable Interruptions > From when N/A.
 2014-07-23 01:45:38 +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
f23885b92f am b763e342: Improve protection against malicious admins. 
* commit 'b763e34210e3947b46ef7c9bf396579f17ab0daf':
  Improve protection against malicious admins.
 2014-07-23 01:35:53 +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
Alan Viverette
a9653308e4 am 7e974f4c: Merge "Reset color space when development options are disabled" into lmp-dev 
* commit '7e974f4c8428b889a45e46aa32832e68c5173f3d':
  Reset color space when development options are disabled
 2014-07-23 00:27:41 +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
John Spurlock
58c891e8ba am 54612391: Settings: Tweak zen alarm info string. 
* commit '54612391878a2300fc44ea3f4befc171b3d5e737':
  Settings: Tweak zen alarm info string.
 2014-07-22 23:57:05 +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
Jeff Sharkey
13948a69f4 am e65bb492: Merge "Data Usage, materialized!" into lmp-dev 
* commit 'e65bb4927faf8e353c73b58648e51a8081615dcf':
  Data Usage, materialized!
 2014-07-22 23:44:38 +00:00
PauloftheWest
ca6d88aac9 am 0da1f851: Removed WPA PSK from HotSpot Options 
* commit '0da1f8515a6af368a923cc99e5435795a031692a':
  Removed WPA PSK from HotSpot Options
 2014-07-22 23:40:20 +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