Mark Salyzyn
d98dc9f70e
Merge \\\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\\" am: a1b40f0267 am: 455006c9ca
...
am: 2e6a8bb8f8
Change-Id: I67e73fbe05e88580d41bae73436e53a325655634
2016-07-13 18:09:12 +00:00
Mark Salyzyn
455006c9ca
Merge \"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\"
...
am: a1b40f0267
Change-Id: I38e4c7756a2ea617053656558d8223458d898a28
2016-07-13 18:02:20 +00:00
Mahaver Chopra
fae757cb1c
Merge \"Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED\" into nyc-mr1-dev
...
am: ec618dc585
Change-Id: Ide526f716b96a73635853d621bef61d09ff04425
2016-07-13 12:34:04 +00:00
Mahaver Chopra
ec618dc585
Merge "Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED" into nyc-mr1-dev
2016-07-13 12:27:03 +00:00
Mark Salyzyn
fc4fd4a3af
Merge \\\"Settings: add logpersist kernel only selection\\\" am: 3c60540078 am: bd900c98ef
...
am: 364322a81d
Change-Id: I46f8b760043a4cafcb1798479f10a623776a0f7b
2016-07-12 15:35:14 +00:00
Mark Salyzyn
bd900c98ef
Merge \"Settings: add logpersist kernel only selection\"
...
am: 3c60540078
Change-Id: Ieefd7e08368174f735b8491f8f01847906e1fd3b
2016-07-12 15:29:51 +00:00
Mark Salyzyn
98849ce7ae
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
...
- Deal with trampoline, where we read logd.logpersistd and
logd.logpersistd.buffer, write to persist.logd.logpersistd and
persist.logd.logpersistd.buffer and logd.logpersistd*
- Deal with an as designed requirement that empty values do not
automatically trampoline, to properly communicate state.
- check logd.logpersistd.enable boolean for support
Bug: 28936216
Bug: 29831823
Change-Id: Ib460ca90738ffdee17084349c1035701301c52bc
2016-07-12 07:22:41 -07:00
Mark Salyzyn
338377b3a0
Settings: add logpersist kernel only selection
...
Bug: 28936216
Bug: 29831823
Change-Id: I9bfbb2717c2d4d39bfda6b92221a38985a4f4973
2016-07-12 07:22:41 -07:00
Mahaver Chopra
6bc19a2e5c
Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED
...
Currently we used global setting to restrict user from enabling oem
unlock. As global settings can be chagned using adb, using user
restrictions instead.
Bug: 29893399
Change-Id: Icaffb080979a447d1e0f7f0d72f92c9db83ac10c
2016-07-12 15:18:49 +01:00
Makoto Onuki
5922902ab3
Merge \"Restore \"reset ShortcutManager rate limiting\" dev option\" into nyc-mr1-dev
...
am: ed9aed1878
Change-Id: If095c72ed03bbae493259479c6b23a862e71db4c
2016-07-11 18:09:18 +00:00
Makoto Onuki
0651701930
Restore "reset ShortcutManager rate limiting" dev option
...
Bug 30031093
Change-Id: I28cbf56e61937b15eb5806823f40e43d6bac4e72
2016-07-08 09:37:48 -07:00
Steven Ng
732418cc07
Merge \"Update the OEM unlock preference summary to reflect the disable reason\" into nyc-mr1-dev
...
am: dbb8cab438
Change-Id: Ib90a577fdef5fad79c0bf84b8b50d35f2ff688ed
2016-06-27 19:20:10 +00:00
Steven Ng
0998abfc8f
Update the OEM unlock preference summary to reflect the disable reason
...
3 cases implemented:
1) Bootloader unlocked
2) Device SIM-locked
3) Device Configuration, such as SIM-lock, has not been retrieved.
Bug: 29047618
Change-Id: Idf5cc1c9b1d105a0efd408cc2aa0e229e874442e
2016-06-23 10:21:05 +01:00
Mark Salyzyn
2fda09ad85
resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp
...
am: f8c135a986
Change-Id: Ie1a71f0f029e5ca156eee2c15dc4670a724cc69c
2016-06-11 05:18:20 +00:00
Ruchi Kandoi
f8c135a986
resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp
...
Change-Id: If75736f8e36e2a8e13fe9740f89f632ee6bedd49
2016-06-10 22:04:52 -07:00
Mark Salyzyn
03af2286ee
Settings: add logpersist selection (actions)
...
- Only add logpersist menu if debuggable.
- Only enable logpersist menu if Logging is On.
- Add selection for Off, All and All minus radio.
- Pop up warning box that persistent storage is to be cleared when
selecting Off (but not if turned off by Logging Size Off or
Disabling Debugger Options).
Bug: 28936216
Change-Id: Ic0a58abdcd6ca41069efb818d1dcef4e3927d2de
2016-06-10 21:44:32 +00:00
Wei Wang
1aa166f490
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev am: d0d3ca3b7c
...
am: 704476a96d
* commit '704476a96d5363679ddcb6d311bb6ca7c4a5faae':
Revert "Add an entry in developer options for location tools."
Change-Id: I3ed38b246d4f9aa64daa1c432d8f0b5020515e5a
2016-06-02 17:25:41 +00:00
Wei Wang
c687e9bfbd
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
...
am: d0d3ca3b7c
* commit 'd0d3ca3b7c64dc30c5262251b5a6f610e2127a69':
Revert "Add an entry in developer options for location tools."
Change-Id: I66441bf21ddd8f0977bcaec7d92a28406e3bcf0e
2016-06-02 17:22:59 +00:00
Wei Wang
d0d3ca3b7c
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
2016-06-02 17:14:02 +00:00
Wei Wang
a0b28146ba
Revert "Add an entry in developer options for location tools."
...
Bug:28251942
This reverts commit e1c1a13cba .
Change-Id: I864a813e8f6a9488b4db2f876a0097e947ceae45
2016-06-02 04:42:02 +00:00
Mahaver Chopra
dcf3d7c185
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
...
Bug: 28339424
Change-Id: I2ccba997fc6c9ccfab802c0f49a9e2115a314552
2016-05-24 12:04:49 +00:00
Steven Ng
3fe140315d
Add a Global setting for disabling OEM unlocking setting
...
+ Don't enable OEM unlocking setting if the global setting disallows it.
Bug: 28163088
Change-Id: Ic306da3fa2cecb90865be055566a7e1603e6b5e2
2016-05-13 14:09:59 +00:00
Jason Monk
7519954286
Expose dialog for current webview setting.
...
Change-Id: I91c796b2c75c0ac8047ba0c2555a1036e8c6c616
Fixes: 28554048
2016-05-11 11:20:55 -04:00
Wei Wang
920cf0a7b3
Merge "Add an entry in developer options for location tools." into nyc-dev
2016-04-28 05:57:30 +00:00
Wei Wang
e1c1a13cba
Add an entry in developer options for location tools.
...
This is a temporary place holder for location dogfood tools, which will
be removed before ship.
Bug:28383982
Change-Id: I814c9a71044c2f73a6346bdd46ecd40375c984b8
2016-04-27 15:51:19 -07:00
Dan Sandler
3bd52ddf4c
Developer QS tile: Show Layout.
...
Bug: 27872042
Change-Id: I0df2ffecbf7d2682d89c9b8343590bb04bcc305c
2016-04-24 10:53:52 -04:00
Sudheer Shanka
c779bece31
Apply policy transparency to "Stay awake" in Development settings.
...
Bug: 28271254
Change-Id: I203ce5c839e5f0201d287673ec3a48c8f835edc3
2016-04-19 22:49:45 -07:00
Jason Monk
4572249f5d
Remove OpenGL traces from dev settings
...
Change-Id: I43a23e5e7bf02b798f3ddffdf4c21077ef3d5e2f
Fixes: 26741446
2016-04-11 10:17:53 -04:00
Ricky Wai
36cce830b9
Fix work profile screen timeout policy
...
Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.
Bug: 27493348
Change-Id: I09e815d6c6ae6ecd554316cfac82daf0ad0b0cdf
2016-04-07 17:18:04 +01:00
Andres Morales
20064037a7
Merge "handle devices that don't support FLASH_LOCK_STATE" into nyc-dev
2016-04-07 00:00:38 +00:00
Andres Morales
ce4bdca151
handle devices that don't support FLASH_LOCK_STATE
...
only disable OEM unlocking pref for devices that report
FLASH_LOCK_UNLOCKED.
Bug: 27967926
Change-Id: Ia41b0dc9249e11df2fb35263ebde05f3a2e0d29a
2016-04-06 15:04:48 -07:00
Udam Saini
e20deea711
Merge "Prevents users from being added if device is not provisioned" into nyc-dev
2016-03-31 20:13:40 +00:00
Jason Monk
2de6a287ca
Merge changes I22d799f8,I1bc14e7a into nyc-dev
...
* changes:
Guard against crash in dev options
Switch to whitelist for animations
2016-03-28 14:14:01 +00:00
Udam Saini
679f7ad07e
Prevents users from being added if device is not provisioned
...
Also added a utility function for checking provisioning, instead of
repeating code for this check in several places.
bug:26156445
Change-Id: I9f4a280dd0cdf889f892e386dbf6a3fdb2a052ef
2016-03-25 13:33:57 -07:00
Andres Morales
950de0e40a
Merge "don't toggle OEM unlocking if the preference is not enabled" into nyc-dev
2016-03-22 21:20:43 +00:00
Andres Morales
0bb6f70a87
don't toggle OEM unlocking if the preference is not enabled
...
Toggling the top-level switch is bypassing the disabled
state of the switch and leaving it in an inconsistent and
unrecoverable state.
Bug: 26863852
Change-Id: I9fed626b743fd6aac2c20910493bdec4778cc629
2016-03-22 12:56:29 -07:00
Jason Monk
aa864953b7
Guard against crash in dev options
...
Bug: 27480962
Change-Id: I22d799f8796f94febda7bd49eb7431d29201e37f
2016-03-18 15:16:18 -04:00
Makoto Onuki
bdcce70572
Add "Reset ShortcutManager throttling" to dev options
...
Bug 27325877
Change-Id: Ib11d670b38055801ce19aea9530ad69907c9bd8e
2016-03-09 14:08:54 -08:00
Andres Morales
fb2bae9519
Use getFlashLockState API to check lock state
...
Bug: 26039090
Change-Id: Ia90d6ece2dcdd5ed8549044900f79c0bf4902296
2016-03-03 15:42:45 -08:00
Gustav Sennton
0f1e17b76c
Merge "Block the user from enabling or disabling webview fallback packages." into nyc-dev
2016-02-24 19:00:35 +00:00
Andres Morales
cc81fb8875
Merge "fix issue when cancelling OEM unlocking change" into nyc-dev
2016-02-24 16:05:21 +00:00
Gustav Sennton
a4e32a24c4
Block the user from enabling or disabling webview fallback packages.
...
Now that we support webview fallback packages - packages that should be
enabled if and only if no other webview packages are available - we need
to ensure that the Settings UI consistently shows that these packages
cannot be enabled or disabled (e.g. the 'Enable' and 'Disable' buttons
for enabling/disabling them are greyed out).
Also, remove the Dialog that lets a user enable a disabled webview
package from the webview implementation Dev Setting. Instead show a
Toast if the user has chosen an invalid package.
Bug: 26375524, 26375860
Change-Id: I949083d3f7c83cd2e049dd2c5c15ec5ab880fe07
2016-02-23 14:09:13 +00:00
Wale Ogunwale
0b485bb523
Merge "Revert "Add developer option for freeform window support (2/2)"" into nyc-dev
2016-02-23 02:27:14 +00:00
Wale Ogunwale
a48c78ccfc
Revert "Add developer option for freeform window support (2/2)"
...
This reverts commit 292b9fd2da .
Will add back later and limit to non-user builds.
Bug: 27295415
Bug: 25276672
Bug: 24815256
Change-Id: Ide230449615318a0d3f4bc607724e7eaaf1d43c4
2016-02-22 15:41:43 -08:00
Alan Viverette
f4ace6fe91
Merge "Remove night mode from developer settings" into nyc-dev
2016-02-22 20:44:00 +00:00
Andres Morales
8b85fbfe51
fix issue when cancelling OEM unlocking change
...
Bug: 26928752
Change-Id: Ibafe9df564f1035cbd6782d8982bc3b424ee3cb4
2016-02-22 12:26:45 -08:00
Alan Viverette
686f984384
Remove night mode from developer settings
...
It's in SysUI Tuner now.
Change-Id: If1c248bfaa964b4f37155619a4c54f836d33e468
2016-02-22 13:47:50 -05:00
Gustav Sennton
b2e8d34359
Merge "Don't show disabled packages in the WebView implementation Dev setting." into nyc-dev
2016-02-22 10:10:13 +00:00
Sudheer Shanka
7dbbe13168
Add disabled by policy empty views to more screens.
...
Bug: 27214401
Change-Id: I6cd4292a63610671070bf2134105e9e348c3ab32
2016-02-19 20:18:43 +00:00
Tobias Sargeant
f8364f597b
add developer setting for multiprocess webview
...
Change-Id: I9cd547ad4168b56b8b5c9eab9e2407daea74a30e
2016-02-17 21:07:54 +00:00