Andrew Scull
0aa45bed65
Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock.
...
If an admin has set the DISALLOW_FACTORY_RESET user restriction, OEM
unlock is also restricted. If this is the case, it should be explained
to the user that the admin is preventing the OEM unlock.
DISALLOW_OEM_UNLOCK is deprecated and now managed by OemLockManager.
This restriction is also one set by the carrier, not an admin.
Test: RunSettingsRoboTests
Test: CTS verifier test from the bug
Bug: 65124732
Change-Id: I8bde87a522742a7cbda006eee17c2a19797b1835
2017-09-08 12:40:25 +01:00
edgar.huang
d2a65d5f03
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7 am: 8f42d1a4ab am: e096a55f03
...
am: 8aeabc23c6
2017-09-06 01:56:23 +00:00
edgar.huang
8aeabc23c6
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7 am: 8f42d1a4ab
...
am: e096a55f03
2017-09-06 00:44:05 +00:00
edgar.huang
e096a55f03
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7
...
am: 8f42d1a4ab
2017-09-06 00:30:44 +00:00
edgar.huang
8f42d1a4ab
Merge "Settings is crashed high probability when doing follow steps"
...
am: 2584202cb7
2017-09-06 00:21:17 +00:00
Treehugger Robot
2584202cb7
Merge "Settings is crashed high probability when doing follow steps"
2017-09-06 00:12:44 +00:00
Adrian Roos
b1758afdf0
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev am: d57edb708f
...
am: 2faa5e7ac5
2017-09-05 18:58:22 +00:00
Adrian Roos
2faa5e7ac5
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
...
am: d57edb708f
2017-09-05 18:55:47 +00:00
TreeHugger Robot
d57edb708f
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
2017-09-05 18:43:30 +00:00
Adrian Roos
1262f39600
FRP: Use SUW theme for factory reset protection flow
...
Bug: 37224506
Test: adb shell settings put global device_provisioned 0 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL com.android.settings; verify it uses correct theme
Change-Id: I237d8d84840398ebfdc97bf99dce07447042b349
2017-09-05 13:52:26 +02:00
edgar.huang
ab6f11f47f
Settings is crashed high probability when doing follow steps
...
Enter into the fingerprint list screen and delete and identification of operation at the same time, when the item of the fingerprint verification was deleted, highlighting the item to be deleted, just so NullPointerException occurred.
Test: manual - enrolling a fingerprint and do above steps.
2017-09-05 06:35:27 +00:00
Daniel Nishi
09ed020f13
Merge "Make photos/videos storage preference normal." into oc-mr1-dev am: 3d1f6abd6f
...
am: 5467aed58d
2017-09-02 03:58:04 +00:00
Daniel Nishi
5467aed58d
Merge "Make photos/videos storage preference normal." into oc-mr1-dev
...
am: 3d1f6abd6f
2017-09-02 03:39:51 +00:00
TreeHugger Robot
3d1f6abd6f
Merge "Make photos/videos storage preference normal." into oc-mr1-dev
2017-09-02 03:29:52 +00:00
Daniel Nishi
9be0ce09c9
Make photos/videos storage preference normal.
...
We had special behavior for it in the past, but this defines new
behavior that is much closer to what the other storage preferences do.
A photo app filter is used and a photos/video files preference exists on
it which intents over to the gallery app.
Fixes: 64147318
Test: Settings robotests
Change-Id: I47284515fe2dfcc924ae61a44bc47051e9f5fda6
2017-09-01 17:51:56 -07:00
Doris Ling
87ca13d446
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev am: 5fe8e76b36
...
am: c905662743
2017-09-02 00:46:36 +00:00
Doris Ling
c905662743
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev
...
am: 5fe8e76b36
2017-09-02 00:41:28 +00:00
TreeHugger Robot
5fe8e76b36
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev
2017-09-02 00:17:08 +00:00
Daniel Nishi
2e47a32605
Merge "Show work profile apps only on app list." into oc-mr1-dev am: 8618b8649f
...
am: d3e0d745a8
2017-09-01 23:37:21 +00:00
Amit Mahajan
933a4f062d
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev am: cf11e21d47
...
am: f161b63c2a
2017-09-01 23:35:35 +00:00
Daniel Nishi
d3e0d745a8
Merge "Show work profile apps only on app list." into oc-mr1-dev
...
am: 8618b8649f
2017-09-01 23:17:06 +00:00
Amit Mahajan
f161b63c2a
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev
...
am: cf11e21d47
2017-09-01 23:15:59 +00:00
Daniel Nishi
8618b8649f
Merge "Show work profile apps only on app list." into oc-mr1-dev
2017-09-01 22:49:21 +00:00
Amit Mahajan
cf11e21d47
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev
2017-09-01 22:42:09 +00:00
Doris Ling
a7b40995de
Set drawable for the entity header app preference button.
...
In the entity header layout, the action buttons resource is set to null by
default. When we bind the button with the app preference action, we
should also set the drawable to the settings icon as well.
Change-Id: Ic259b4c538f529671ca5a9c67664ef32fbbb25ae
Fixes: 64826061
Test: make RunSettingsRoboTests
2017-09-01 14:52:30 -07:00
Daniel Nishi
83ceab82e4
Show work profile apps only on app list.
...
For the work profile drilldown, we used to show all apps when the user
drilled down into the categories. This makes it so that the drill down
only shows the work apps when that deep.
Change-Id: I492cd3e9b9b923b87b68645a871dcfb2b91b4f95
Fixes: 62963093
Test: Settings robotest
2017-09-01 13:08:48 -07:00
TreeHugger Robot
f4dc03184b
Merge "Removed deprecated BIND_AUTOFILL permission."
2017-09-01 15:11:50 +00:00
Julia Reynolds
0e497230d9
Merge "Add settings page for notification channel groups"
2017-09-01 12:49:39 +00:00
Doris Ling
100e8a3891
Update accessibility preference icon. am: f664c77f31
...
am: c413dd167d
2017-09-01 01:15:08 +00:00
Doris Ling
c413dd167d
Update accessibility preference icon.
...
am: f664c77f31
2017-09-01 00:47:41 +00:00
TreeHugger Robot
650faa3ace
Merge "Fix ClassScanner and re-enable CodeInspectionTest tests"
2017-08-31 23:26:51 +00:00
Colin Cross
c19d2bccbf
Merge "Fix errorprone build" am: 0bed3cacd7 -s ours am: a1bcb02184 -s ours am: 450f423a21 -s ours
...
am: bfab966085
2017-08-31 22:43:03 +00:00
Colin Cross
bfab966085
Merge "Fix errorprone build" am: 0bed3cacd7 -s ours am: a1bcb02184 -s ours
...
am: 450f423a21
2017-08-31 22:35:19 +00:00
Colin Cross
450f423a21
Merge "Fix errorprone build" am: 0bed3cacd7 -s ours
...
am: a1bcb02184
2017-08-31 22:27:59 +00:00
Colin Cross
a1bcb02184
Merge "Fix errorprone build"
...
am: 0bed3cacd7
2017-08-31 22:24:00 +00:00
Treehugger Robot
0bed3cacd7
Merge "Fix errorprone build"
2017-08-31 22:16:52 +00:00
Doris Ling
f664c77f31
Update accessibility preference icon.
...
Change-Id: I84fb84e0a8bb422b9e453bd9b94e99bfb8a73be3
Fixes: 65256821
Test: visual
2017-08-31 14:58:15 -07:00
Felipe Leme
b628d1ed53
Removed deprecated BIND_AUTOFILL permission.
...
Test: make -j100 RunSettingsRoboTests
Bug: 37563972
Change-Id: I423f9c6234e8c1898ed66b22e1078c6f91c58422
2017-08-31 14:28:39 -07:00
Amit Mahajan
a00af97ab1
Change to disable mvno data field in ApnEditor if needed.
...
Test: manual
Bug: 65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
2017-08-31 21:01:25 +00:00
Antony Sargent
ec452e58a5
Fix ClassScanner and re-enable CodeInspectionTest tests
...
This fixes the code in ClassScanner for finding all classes in a given
package to not depend on directory entries in the .jar files generated
by the build system. This dependency caused our tests in
CodeInspepectionTest.java to fail when this CL:
https://android-review.googlesource.com/#/c/platform/build/+/456418/
stopped adding directory entries in the .jar files generated by the
build process. Instead of depending on directories being present in the
list of resources provided by the classloader, this CL switches to using
Guava's ClassPath class to enumerate all loadable classes and filter
them to the ones in the package of interest.
Change-Id: I583919096450b61d4816256be280e2f5f1ce2316
Fixes: 64840107
Test: make RunSettingsRoboTests
2017-08-31 14:00:15 -07:00
Alison Cichowlas
3e5c6f718a
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev am: 49d25a0506
...
am: 4010eb294f
2017-08-31 20:23:27 +00:00
Alison Cichowlas
4010eb294f
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev
...
am: 49d25a0506
2017-08-31 20:10:19 +00:00
Jack He
0921319824
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev am: bf66bf30b1
...
am: 4dddaf18e1
2017-08-31 19:54:20 +00:00
TreeHugger Robot
49d25a0506
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev
2017-08-31 19:51:50 +00:00
Jack He
4dddaf18e1
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev
...
am: bf66bf30b1
2017-08-31 19:25:33 +00:00
TreeHugger Robot
bf66bf30b1
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev
2017-08-31 19:16:50 +00:00
Phil Weaver
c0f77c7e6f
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 -s ours am: 8d9e305d84 -s ours
...
am: 60a0a021d1
2017-08-31 19:08:18 +00:00
Daniel Nishi
cdab0de21f
Merge "Tint the work icon." into oc-mr1-dev am: 260ec8b9ea
...
am: 270f217c9f
2017-08-31 18:19:33 +00:00
Phil Weaver
37e0c1f3cc
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 am: f8a7b8aff0 -s ours
...
am: d88b7364d8
2017-08-31 18:18:44 +00:00
Phil Weaver
60a0a021d1
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 -s ours
...
am: 8d9e305d84
2017-08-31 18:06:49 +00:00
