Commit Graph

38116 Commits

Author SHA1 Message Date
Kevin Chyn
39d2a2def1 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709 am: b8486ee467
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578

Change-Id: Id1de8f9d9bc4625206f26472ea237ce4392ee037
2021-06-17 02:15:45 +00:00
Kevin Chyn
8979a18492 Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df am: 8cf5ca3382
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599

Change-Id: I20f74bed342e97a22bf1aa5f3e74a70821f86270
2021-06-17 02:13:46 +00:00
Kevin Chyn
e51d57b2c0 Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28 am: e9da6b3e58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754

Change-Id: I2e349a404656258bbf59370aece87577e90dedd2
2021-06-17 02:13:43 +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
5a8476a709 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev 2021-06-17 01:28:17 +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
750ca2fc67 Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188 am: e8d7346216
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591

Change-Id: I4bc8555dd7ec1703fa61e8717f075e8d626d6e56
2021-06-16 17:55:15 +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
932b4d4505 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 am: d9f6bf7461
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824

Change-Id: I5de5e4ec6ff5fdfe85c42fe54a047024d084795a
2021-06-16 11:45:33 +00:00
TreeHugger Robot
4d648f054d Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev am: 1803aead52 am: 59faa6ceef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980888

Change-Id: I209599f5914c59c681ec1de903a8e07636de8e82
2021-06-16 11:45:26 +00:00
TreeHugger Robot
cbcd1e663e Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3 am: 3ce2aaf7b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349

Change-Id: I9180a7d2471436b9619ceaafac0ad945ac4ce16a
2021-06-16 11:45:12 +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
c0b23b03c3 Merge "Fix the toggle button flicker problem when display" into sc-dev 2021-06-16 11:19:22 +00:00
Stanley Wang
40f1be96d7 Merge "Update the illustrations to Lottie format." into sc-dev am: 51308300ef am: c4427c7878
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934762

Change-Id: Ia4d5a8212e71f2024cad143b26e23fae1047b861
2021-06-16 09:51:08 +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
e3dbb8f637 Merge "[Provider Model] Show scanning sub-title once in the internet panel" into sc-dev am: 059b3fab8e am: 46cd409eda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980879

Change-Id: I2293bc2f62f15a910223c69bbbcbad628d60119d
2021-06-16 09:09:15 +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
Kevin Chyn
c211d18e1b Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78 am: aa2b29b5ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752

Change-Id: I5b08be21aa233dcdb501075fd5527722b04bf538
2021-06-16 08:10:25 +00:00
Edgar Wang
70aa5739d4 Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev am: fce6e1772a am: 618deb0691
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980881

Change-Id: I7405fe05ddf77999218e3de74225c73b8102acd4
2021-06-16 08:10:14 +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
8903432b39 Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c am: 55fec6e32e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617

Change-Id: Ia4b774b754d78f6595778c130129ff6c0e57c6bd
2021-06-16 06:47:11 +00:00
Kevin Chyn
0b121f260d Merge "Convert biometrics to RestrictedPreference" into sc-dev am: 24b81dcffb am: 0f6dac59c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14926710

Change-Id: Ib153b57a8285a590d9e344cfda0c8ef4360a3bde
2021-06-16 06:46:17 +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
Kevin Chyn
35aa93d8d2 Pass context and enforcedAdmin to onClickListener
These are apparently not available / not initialized in the
constructor. So, let's just pass it in from known entry points.

Bug: 188847063
Test: Builds
Change-Id: I5467f341ccf017ddfb31ef9fc4ef1756ebb65939
2021-06-15 20:57:30 -07: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
79294dfb70 Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84 am: 8f06c94891
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625

Change-Id: I7f8dd822cef340cd7d9b4376956ae2a90965b03b
2021-06-16 00:33:53 +00:00
Peter Wang
3a942538d2 Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b am: a9e0a0d2c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994

Change-Id: Icdd781c5e4f5ea3db4e54e07980511e0e6bf55e9
2021-06-16 00:09:22 +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
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
8b12824554 Merge "Integrate One handed mode shortcut preference" into sc-dev am: bfe1d39958 am: f499ee9d0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934755

Change-Id: Ieed86b5852ccf3d41b2d5bea88dcd60cfb0bde49
2021-06-15 15:31:20 +00:00
TreeHugger Robot
bfe1d39958 Merge "Integrate One handed mode shortcut preference" into sc-dev 2021-06-15 15:25:13 +00:00
Weng Su
22ce63ff6f [Provider Model] Show scanning sub-title once in the internet panel
- Show "Searching for network" sub-title once when the Wi-Fi list is
empty

Bug: 189912933
Test: manual test
atest -c InternetConnectivityPanelTest

Change-Id: I1681593461c35160d6337056b2097aa4fdd8c3f8
2021-06-15 22:58:26 +08:00
Zimuzo Ezeozue
0ba3e46e2a Merge "Turn off transcoding notification by default" into sc-dev am: 653e7c91c8 am: fdfebb9ff9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964377

Change-Id: I2ee0fc40f94d03f637b58bb079f3fb535b9504af
2021-06-15 14:08:45 +00:00
Zimuzo Ezeozue
653e7c91c8 Merge "Turn off transcoding notification by default" into sc-dev 2021-06-15 13:49:19 +00:00
TreeHugger Robot
a8fcc6a678 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev am: ab04f86066 am: 91d1b6640a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964828

Change-Id: Ic3e3f1c1364e529c57a01d332e2244d0615ec566
2021-06-15 13:01:36 +00:00
TreeHugger Robot
ab04f86066 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev 2021-06-15 12:36:38 +00:00
Stanley Wang
09fd6ca720 Update the illustrations to Lottie format.
- Add the fake illustrations to Settings.
- Update the illustrations of the following items.
  Adaptive battery
  Swipe fingerprint for notifications
  Quick open camera
  Flip camera for selfie
  One-hand mode
  Tap to check phone
  Lift to check phone
  Prevent ringing

Bug: 190807662
Test: robotest and see the UI
Change-Id: I39c72570c61b0871ab5949ecca9a99d5404d1811
2021-06-15 20:23:04 +08:00
Peter Wang
8ca1af4b9f Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749 am: 655375feff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: If6474f55d2aeb56cb3dbdb345f199c438ae9fd3e
2021-06-15 11:26:52 +00:00
Peter Wang
03d2f8d749 Merge "Use BC theme for ChooseSimActivity" into sc-dev 2021-06-15 10:02:34 +00:00
Peter Wang
d368e85c2e Use translated name ("SIM") for default profile display name ("CARD")
Bug: 186156909
Test: Local
Change-Id: Icb8e5e7afb64d28e1ff7567882288fb1621dbe9a
2021-06-15 02:59:21 -07:00