Kevin Chyn
0c34d259a0
Show biometric-specific dialog when appropriate
...
1) We need to pass a "restriction" string from settings to the dialog,
otherwise the biometric dialog could be shown in non-biometric
flows
2) Updates ActionDisabledByAdminDialogHelper to pass the restrition
to be taken into consideration when creating the controller
3) Sets an optional onClickListener on the positive button.
Bug: 5788943
Test: atest ParentalControlsUtilsTest
Change-Id: Iedff7fef50e186b2779f061f37d3080c910d2179
2021-06-15 20:57:26 -07:00
Sunny Shao
9fa4bb8ffa
Fix the toggle button flicker problem when display
...
- Root cause: the side effect of the parallel controller loading.
- Solution: disable the parallel approach and remove the entry point
of parallel approach in DashboardFragment.
Fixes: 187838753
Test: Robo test for AppInfoDashboardFragment, ConfigureNotificationSettings,
ConnectedDeviceDashboardFragment, DevelopmentSettingsDashboardFragment,
NetworkDashboardFragment, DashboardFragment
Change-Id: If3b09c4fd6f33042e0ed38704f08e855ab8f5377
2021-06-16 11:41:10 +08:00
Kevin Chyn
fc19953d28
Add biometric strings to DeviceAdminStringProviderImpl
...
Bug: 190067596
Test: manual
Change-Id: I3a8f94fd6b2730164dff263f068543abd8d4d18b
2021-06-15 19:58:53 -07:00
Kevin Chyn
add8de49e9
Move testAlwaysRequireConsent to frameworks/base
...
Bug: 188847063
Test: atest ParentalControlsUtilsTest
Change-Id: I1c374b0e0e051a2e911d4586f7f2f9928c9de260
2021-06-15 19:58:47 -07:00
Kevin Chyn
ee3ca1506a
Update to use ParentalControlsUtilsInternal for common logic
...
Bug: 188847063
Test: atest ParentalControlsUtilsTest
Change-Id: I14ba3683f846ad7ff6e9f2eb5013d9033556e706
2021-06-15 19:58:41 -07:00
Kevin Chyn
9af27677e9
Convert biometrics to RestrictedPreference
...
Bug: 188847063
Test: adb shell settings put secure com.android.settings.biometrics.ParentalControlsUtils.always_require_consent 1
Preference becomes gray with an info icon
Test: atest ParentalControlsUtilsTest
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricStatusPreferenceControllerTest
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=FingerprintStatusPreferenceControllerTest
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=FaceStatusPreferenceControllerTest
Change-Id: I929c11606eec76063f7b060fdc5cb2b5f60a80e2
2021-06-15 19:57:04 -07:00
Joshua Mccloskey
cf0bcde113
Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84
am: c5b5317ef2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625
Change-Id: I9117a171d4322c43f7fa543e092c76c0d1a64468
2021-06-16 00:34:40 +00:00
Joshua Mccloskey
e9649e3d09
Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84
am: 5214307f79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625
Change-Id: I8db3d12ed220e7f3913c10e70ddd8421b6b7fa87
2021-06-16 00:34:21 +00:00
Joshua Mccloskey
5214307f79
Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625
Change-Id: I2ef317f99c2f27223b31646ba74129426e32f253
2021-06-16 00:19:49 +00:00
Joshua Mccloskey
c5b5317ef2
Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625
Change-Id: I4e54f9189a9e47dc043ded6fbae1ce1e0656d9a3
2021-06-16 00:18:57 +00:00
Peter Wang
4d7d0bf049
Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b
am: 6fb591f769
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994
Change-Id: Id07ebce31feb4eb63872bdb6e338ba4eb209369e
2021-06-16 00:09:57 +00:00
Peter Wang
999e19ee8e
Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b
am: a9d081fb66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994
Change-Id: I9c22393c0faf6df8fab96d635cf3ece396974dc9
2021-06-16 00:09:29 +00:00
Joshua Mccloskey
19baf0df84
Merge "Update multi biometric flow for SUW" into sc-dev
2021-06-16 00:07:16 +00:00
Peter Wang
a9d081fb66
Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994
Change-Id: Ic5c1d44105acd3f77cbcb0e0666440b184f97ba9
2021-06-15 23:56:05 +00:00
Peter Wang
6fb591f769
Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994
Change-Id: I340b7f256b0df90d50a90320fd5628968332bd6e
2021-06-15 23:55:21 +00:00
Peter Wang
faac8d0f4b
Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev
2021-06-15 23:42:24 +00:00
Edgar Wang
1e3c0115a5
Tweak SeekBarPreference to folow new Settings UX design
...
Bug: 186068091
Test: visual verify
Change-Id: I2cd7f57a75f8512080e9b5e891c27db6297b0729
2021-06-16 03:47:36 +08:00
Sally
d98ee531c1
Add labels to intensity slider and flip labels
...
Labels are Dimmer and Brighter. As the slider value is lowered,
the dimming intensity is increased
Slider min = 100 - intensity max
Slider max = 100 - intensity min
Ex: If intensity max = 80, the slider min with be 20. If the user
moves the position to the minimum end we'll send 80 to Color DisplayManager
Test: atest ReduceBrightColorsIntensityPreferenceControllerTest,
manual
Bug: 190722076
Change-Id: Ib05ba38805b8fa1f68c144a3929027899df70abf
2021-06-15 15:59:33 +00:00
TreeHugger Robot
e2a9ccb1bd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d
-s ours am: d22c1aaaeb
-s ours am: d15259021a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974729
Change-Id: I4fc3cb4426e6c761baa69944e86a661ac13fbc27
2021-06-15 15:52:08 +00:00
Bill Yi
7b2eb38321
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3
-s ours am: c42235e677
-s ours am: cd62dd50ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981152
Change-Id: I8d1c99ea0caa38a6a45cd1401ef84fd40dc9560d
2021-06-15 15:52:03 +00:00
TreeHugger Robot
a44653afd5
Merge "Integrate One handed mode shortcut preference" into sc-dev am: bfe1d39958
am: 2ab7842fd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934755
Change-Id: Icf6d5acfcec494f060ba8c5e8b97be367bf40c1c
2021-06-15 15:51:39 +00:00
TreeHugger Robot
5af65de4c4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d
-s ours am: d22c1aaaeb
-s ours am: 8d694a6948
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974729
Change-Id: I5eb038b0a2dba25dbac0b12952b566903bfc9ed1
2021-06-15 15:43:35 +00:00
Bill Yi
dded88366d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3
-s ours am: c42235e677
-s ours am: 4ca76e5213
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981152
Change-Id: I64e1a997b40be1bc1643f638477f357d116493d9
2021-06-15 15:43:25 +00:00
TreeHugger Robot
8d694a6948
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d
-s ours am: d22c1aaaeb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974729
Change-Id: I0c0594d5b037d35c13634bb6be695f5e1a108cda
2021-06-15 15:34:21 +00:00
Bill Yi
4ca76e5213
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3
-s ours am: c42235e677
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981152
Change-Id: I5fe840eb53eb3da644934c71e7ecca433f6c841a
2021-06-15 15:34:18 +00:00
TreeHugger Robot
a1dd2d6483
Merge "Integrate One handed mode shortcut preference" into sc-dev am: bfe1d39958
am: 3fd1df4e04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934755
Change-Id: I7ffe099c59923a6f26a1c5214ddc92414b4f1d2b
2021-06-15 15:31:32 +00:00
TreeHugger Robot
d017b2031a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818
-s ours am: 575e06dbb1
-s ours am: bf67fa399d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981155
Change-Id: Iad1375504a4ab00c96b8f512ad1e03d155a171f0
2021-06-15 15:31:28 +00:00
Bill Yi
7e156a74bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098
-s ours am: cb28fd1d30
-s ours am: 9d3a9178ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981156
Change-Id: Ic8c2432093175f9dc2170aeb8b18bee75eb2bdd1
2021-06-15 15:31:24 +00:00
TreeHugger Robot
d15259021a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d
-s ours am: d22c1aaaeb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974729
Change-Id: I215da74523dde305bba0f106ff222c61353d39f9
2021-06-15 15:31:06 +00:00
TreeHugger Robot
1baebdb976
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c2989e3d1c
-s ours am: 8b70eba471
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981161
Change-Id: I9a55b97c4d72e74cf82b3cb1df2d962ee7ebd2c1
2021-06-15 15:31:05 +00:00
Bill Yi
cd62dd50ca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3
-s ours am: c42235e677
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981152
Change-Id: I8948b361a06a64cc25aada0d21b520e494dd86b6
2021-06-15 15:31:02 +00:00
TreeHugger Robot
2ab7842fd3
Merge "Integrate One handed mode shortcut preference" into sc-dev am: bfe1d39958
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934755
Change-Id: Id9bc642aa5326e192c1ba39b0118f5bf98478066
2021-06-15 15:30:58 +00:00
TreeHugger Robot
a5bffcc5b2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 59205fce57
-s ours am: bff71db6fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981158
Change-Id: I6de5b339c352b12af3db8ae1872d499023034339
2021-06-15 15:30:55 +00:00
TreeHugger Robot
d22c1aaaeb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974729
Change-Id: I7e6506656caa7aa169958a446318a53ebab58ff0
2021-06-15 15:30:43 +00:00
Bill Yi
c42235e677
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981152
Change-Id: I4fbcf1ae14ce66253ed94265bcb3dbb32c9cdc92
2021-06-15 15:30:28 +00:00
TreeHugger Robot
3fd1df4e04
Merge "Integrate One handed mode shortcut preference" into sc-dev am: bfe1d39958
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934755
Change-Id: Icefd1b02303f58db22ec3b759359658077bf999f
2021-06-15 15:29:55 +00:00
TreeHugger Robot
bfe1d39958
Merge "Integrate One handed mode shortcut preference" into sc-dev
2021-06-15 15:25:13 +00:00
TreeHugger Robot
d50cb3f9df
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818
-s ours am: 575e06dbb1
-s ours am: 82906da38d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981155
Change-Id: Icd842e1dd4a63a1bf35c209c8d96413eda9754d9
2021-06-15 15:15:06 +00:00
Bill Yi
45403527b9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098
-s ours am: cb28fd1d30
-s ours am: b536f17a93
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981156
Change-Id: I6b81ae96d90c8af6abc7e6e6ab70aecf60d4253f
2021-06-15 15:15:01 +00:00
TreeHugger Robot
33ddf7c74d
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-06-15 15:14:44 +00:00
TreeHugger Robot
61ad461a0a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c2989e3d1c
-s ours am: 27f38d3b75
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981161
Change-Id: I2528108d1567c9d4592f5e2372b9b6fdcda1741d
2021-06-15 15:14:38 +00:00
TreeHugger Robot
d7ae5d8bbd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 59205fce57
-s ours am: 93d2962588
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981158
Change-Id: I3041d14c3dd75382456e27eea06dc2dca03d05d1
2021-06-15 15:14:24 +00:00
TreeHugger Robot
82906da38d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818
-s ours am: 575e06dbb1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981155
Change-Id: Ic07aacf2b2c552c9d77e0ae520aa52365a8b2974
2021-06-15 15:14:16 +00:00
Bill Yi
b536f17a93
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098
-s ours am: cb28fd1d30
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981156
Change-Id: Iaed3a41a0fa184eac17a63b68e5bf8413306dbf5
2021-06-15 15:14:10 +00:00
TreeHugger Robot
0ebd46296e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f50af259f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981162
Change-Id: I8725f9c5b6f7044211386a50ee89504c94ca7617
2021-06-15 15:14:04 +00:00
TreeHugger Robot
27f38d3b75
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c2989e3d1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981161
Change-Id: Icee6dbc7b8d2569a779d4595dafba33be971a935
2021-06-15 15:13:52 +00:00
TreeHugger Robot
bf67fa399d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818
-s ours am: 575e06dbb1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981155
Change-Id: Iffcd7847f37e253e32b2af6dd8167951e6b8e1c9
2021-06-15 15:13:44 +00:00
TreeHugger Robot
13221f4192
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: de9d41cbf3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981159
Change-Id: I80cdcf3dff9c16230b0b92eb947f46768f724fc3
2021-06-15 15:13:37 +00:00
TreeHugger Robot
93d2962588
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 59205fce57
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981158
Change-Id: I8396363e05002a19f16293d8258ba2f8d11839ee
2021-06-15 15:13:32 +00:00
Bill Yi
9d3a9178ff
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098
-s ours am: cb28fd1d30
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981156
Change-Id: Id948569867f68a42b30f8a7ced7efec6e5a7ddfa
2021-06-15 15:13:31 +00:00