Commit Graph

83195 Commits

Author SHA1 Message Date
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
1f0a69cdf2 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: I85a955f48cadecb0a641caaa5a79fce460a21ba1
2021-06-16 11:38:01 +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
49d52d14fe 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: I5a6cd20b1d624d151a052e0898fe072d73acef33
2021-06-16 11:33:09 +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
e0614a8c35 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: Ideba77ce284efcd846339b0628af19a165b0a2b7
2021-06-16 10:14:46 +00:00
TreeHugger Robot
bcc49f1fe0 Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev 2021-06-16 10:06:12 +00:00
Alex Johnston
8c310ec84f 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: Iedbfa501d797d059af8be72905889fd3aa7a12a9
2021-06-16 09:38:25 +00:00
menghanli
25ee0a7438 Fix "Left" & "Right" in the wrong sides for LTR language
Root cause: In the LTR language, the "Left" & "Right" options should be in the opposite sides -- currently "Left" is in the right side and "Right" is in the left side (Same as the English version) and should be changed.
Solution: Keep ltr layout direction.

Bug: 190354990
Test: Manual test
Change-Id: I47b71b3db7c834984202513e2cac6c4d787518dc
2021-06-16 09:38:17 +00:00
Stanley Wang
cd70ac2a5a 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: I1898a72f14b9b78381431c31363ba866fb8566d8
2021-06-16 09:38:11 +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
9d47792db0 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: Idf4a96c0c47211b558546141c93c536f8a6398e1
2021-06-16 08:54:32 +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
663b21c48b 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: I1838009dedd2ac3f6c4511379754816b5eaecddc
2021-06-16 08:09:26 +00:00
Edgar Wang
221f0a023d 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: I40d45fcba54a2975c2165b8e568a5475932fe340
2021-06-16 08:09:18 +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
280958df64 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: Id4f76650ab5ae8f906eb9cba64e465c65ec57cf4
2021-06-16 06:34:12 +00:00
Kevin Chyn
928f3a28dc 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: I3924b671dbe1336e39fd153b5b809a2e3b7e3669
2021-06-16 06:33:49 +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
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
Peter Wang
3b03d484fb Use ICU style for choose_sim_text to handle special cases in RU
Bug: 185406678
Test: Build
Change-Id: I43bf77b0b09ae4c2bb8b3acf976d996854a80866
2021-06-15 18:27:34 -07: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
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
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
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
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
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
bfe1d39958 Merge "Integrate One handed mode shortcut preference" into sc-dev 2021-06-15 15:25:13 +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
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
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