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
6bcd506f22
am e4e607a3
: am 1a0297c5
: Use restrictionsprovider framework in Settings.
...
* commit 'e4e607a3832a4894419c96726361a752a435fe70':
Use restrictionsprovider framework in Settings.
2014-07-23 21:55:33 +00:00
Julia Reynolds
e4e607a383
am 1a0297c5
: Use restrictionsprovider framework in Settings.
...
* commit '1a0297c544cb15ed4b56e70575b169b3889543b7':
Use restrictionsprovider framework in Settings.
2014-07-23 21:22:51 +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
f8af2566f2
am 5f71155c
: am 289a63f5
: Merge "Fix NotificationStation theming" into lmp-dev
...
* commit '5f71155cbc4e677a7bac07296154deef89592e22':
Fix NotificationStation theming
2014-07-23 20:45:14 +00:00
Fabrice Di Meglio
5f71155cbc
am 289a63f5
: Merge "Fix NotificationStation theming" into lmp-dev
...
* commit '289a63f509972372e37fc95de630a5410b4ebd5c':
Fix NotificationStation theming
2014-07-23 20:41:33 +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
8fc6c00652
am 2f2a23de
: am a79400de
: Merge "Code cleaning for NotificationStation" into lmp-dev
...
* commit '2f2a23dee368e04995211994defd72eb8f406a3c':
Code cleaning for NotificationStation
2014-07-23 20:24:13 +00:00
Fabrice Di Meglio
2f2a23dee3
am a79400de
: Merge "Code cleaning for NotificationStation" into lmp-dev
...
* commit 'a79400defc90a65437589cd5ede8de291692c75f':
Code cleaning for NotificationStation
2014-07-23 20:19:36 +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
Fabrice Di Meglio
d2bc6f453c
am c95775b5
: am 6cad2550
: Merge "OwnerInfos code cleaning" into lmp-dev
...
* commit 'c95775b543366e36e652c7d5f04e5b21121053f9':
OwnerInfos code cleaning
2014-07-23 20:01:25 +00:00
Fabrice Di Meglio
c95775b543
am 6cad2550
: Merge "OwnerInfos code cleaning" into lmp-dev
...
* commit '6cad255000e2bff5475e0816d18e4b0b68481283':
OwnerInfos code cleaning
2014-07-23 19:56:46 +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
John Spurlock
2daea07767
am 5c399368
: am d39d7314
: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
...
* commit '5c3993682ab792d7a98792d30181a32e8cb96548':
Settings: Wire up Display > Lift to wake.
2014-07-23 19:28:01 +00:00
John Spurlock
5c3993682a
am d39d7314
: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
...
* commit 'd39d731473efbc84ec5640d89d0f275c759b3402':
Settings: Wire up Display > Lift to wake.
2014-07-23 19:23:46 +00:00
Fabrice Di Meglio
289a63f509
Merge "Fix NotificationStation theming" into lmp-dev
2014-07-23 18:44:51 +00: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
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
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