Kevin Chyn
8cf5ca3382
Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599
Change-Id: I515247c938ac0f3767c7d0031d3a54bc25d0e0a9
2021-06-17 02:00:44 +00:00
Kevin Chyn
e9da6b3e58
Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754
Change-Id: I37dea094206b11ef2897fac5c9911cc804f4be0d
2021-06-17 02:00:42 +00:00
Kevin Chyn
678a57b0df
Merge changes from topic "kchyn-unicorn4a" into sc-dev
...
* changes:
Show biometric-specific dialog when appropriate
Add biometric strings to DeviceAdminStringProviderImpl
2021-06-17 01:27:00 +00:00
Abel Tesfaye
e8d7346216
Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591
Change-Id: I5c465f8c499966f7322600546153974cc0abf54a
2021-06-16 17:38:59 +00:00
Abel Tesfaye
b8c610b188
Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev
2021-06-16 17:25:48 +00:00
Stanley Wang
d9f6bf7461
Merge "Fix the problem that the "Turn off SIM" dialog will be displayed when the MobileNetwork page is slid to to top." into sc-dev am: d0adfa7b3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824
Change-Id: I923a9fefa701ee10b1286b6420bf837169570c62
2021-06-16 11:45:20 +00:00
TreeHugger Robot
59faa6ceef
Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev am: 1803aead52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980888
Change-Id: I813bda8e3264586c7e5812dbda2739f9abefbd0c
2021-06-16 11:45:15 +00:00
TreeHugger Robot
464e12f1fa
Merge "Add One-handed mode entry point in a11y system controls" into sc-dev am: 1da2a5390a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980884
Change-Id: Ie62a92d9b6edde7bd7670a8ffaec1b21f3783274
2021-06-16 11:45:11 +00:00
Stanley Wang
d0adfa7b3e
Merge "Fix the problem that the "Turn off SIM" dialog will be displayed when the MobileNetwork page is slid to to top." into sc-dev
2021-06-16 11:42:00 +00:00
TreeHugger Robot
1803aead52
Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev
2021-06-16 11:38:32 +00:00
TreeHugger Robot
1da2a5390a
Merge "Add One-handed mode entry point in a11y system controls" into sc-dev
2021-06-16 11:35:43 +00:00
TreeHugger Robot
3ce2aaf7b5
Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349
Change-Id: Ie3fe0e9db735548a5f286c67d4083b38519823d2
2021-06-16 11:32:20 +00:00
TreeHugger Robot
c0b23b03c3
Merge "Fix the toggle button flicker problem when display" into sc-dev
2021-06-16 11:19:22 +00:00
TreeHugger Robot
ecaf8796c6
Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev am: bcc49f1fe0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980886
Change-Id: Ib72186a6dd80ff806d27b85f5b71d049375f62aa
2021-06-16 10:13:57 +00:00
TreeHugger Robot
bcc49f1fe0
Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev
2021-06-16 10:06:12 +00:00
Alex Johnston
1827c16d6a
Merge "RequestManageCredentials foldable view" into sc-dev am: 71786f9775
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964381
Change-Id: I6ebbe1e9fc34a08fcdb62a08f0803e8c28034e63
2021-06-16 09:38:12 +00:00
Stanley Wang
c4427c7878
Merge "Update the illustrations to Lottie format." into sc-dev am: 51308300ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934762
Change-Id: Ibf577efb773cb256347ebbb343c075ccc933d17f
2021-06-16 09:37:58 +00:00
Alex Johnston
71786f9775
Merge "RequestManageCredentials foldable view" into sc-dev
2021-06-16 09:27:03 +00:00
Weng Su
58ff170086
Fix the issue of permanent loading when Wi-Fi is disabled
...
Bug: 173207801
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Ib46c620f10987ba52787aae8b5beddb5c68e0e17
2021-06-16 17:26:12 +08:00
Stanley Wang
51308300ef
Merge "Update the illustrations to Lottie format." into sc-dev
2021-06-16 09:24:55 +00:00
TreeHugger Robot
46cd409eda
Merge "[Provider Model] Show scanning sub-title once in the internet panel" into sc-dev am: 059b3fab8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980879
Change-Id: I6053d230dd4afb2eb77aaa9b0b64cb47db76c09e
2021-06-16 08:53:46 +00:00
TreeHugger Robot
059b3fab8e
Merge "[Provider Model] Show scanning sub-title once in the internet panel" into sc-dev
2021-06-16 08:32:16 +00:00
Bill Lin
5b702c70a2
Add One-handed mode entry point in a11y system controls
...
Integrate One-handed mode entry in AOSP Settings.
(Settings > A11y > System controls > One-handed mode)
The entry will show if vendor set below system property
* Property : ro.support_one_handed_mode
Otherwise, the entry will be hidden.
Test: manual check Settings UI
Settings > A11y > System controls > One-handed mode
Bug: 182144396
Change-Id: I699c576a87057274529ca46dee394c413a4cea2b
2021-06-16 16:18:58 +08:00
Kevin Chyn
aa2b29b5ba
Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752
Change-Id: I270cde62b70089dbd3da82a736ccc681eba436f5
2021-06-16 08:08:35 +00:00
Edgar Wang
618deb0691
Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev am: fce6e1772a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980881
Change-Id: I78154ac9c754b782a2657810036684d8d5c3405e
2021-06-16 08:07:56 +00:00
Kevin Chyn
826df7ae78
Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev
2021-06-16 07:55:01 +00:00
Edgar Wang
fce6e1772a
Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev
2021-06-16 07:54:47 +00:00
Kevin Chyn
55fec6e32e
Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617
Change-Id: Ife10fc8ec4813deb4e36c8ef404c9ef5106de7b9
2021-06-16 06:33:09 +00:00
Kevin Chyn
0f6dac59c2
Merge "Convert biometrics to RestrictedPreference" into sc-dev am: 24b81dcffb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14926710
Change-Id: I2f24f3bd62f5a369c18ef12a721a36b28d3be4bb
2021-06-16 06:32:50 +00:00
Kevin Chyn
44a0ddaa4c
Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev
2021-06-16 06:13:17 +00:00
Kevin Chyn
24b81dcffb
Merge "Convert biometrics to RestrictedPreference" into sc-dev
2021-06-16 06:13:04 +00:00
Sunny Shao
794a894aa7
Fix testGetDeviceOwnerDisclosure test case fail
...
- Remove the learn more part which already include in the FooterPreference.
Fixes: 190889944
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImplTest
Change-Id: Ia6b7962019a3ec30b72ca6d64159811ab98fc13b
2021-06-16 13:40:55 +08:00
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
8f06c94891
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: Ie397576862690543e8a086b0d31ce2b515a24988
2021-06-16 00:19:06 +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
a9e0a0d2c9
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: I417868c232c53c08e45b80ff01de012259d7a09a
2021-06-15 23:54:11 +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
TreeHugger Robot
11c290af4c
[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: I9e425e2857f457b81e73ba4d156a24075a81b231
2021-06-15 15:34:26 +00:00
Bill Yi
e4dec43c81
[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: I43f46e1bb2535fa9a250d9bade806fefec8de2b9
2021-06-15 15:34:23 +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
f499ee9d0c
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: I38a3b51522cd0d5d2d26559c5ea7dde930ccd4ed
2021-06-15 15:29:58 +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
8328eff4dd
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-06-15 15:18:05 +00:00