Commit Graph

37280 Commits

Author SHA1 Message Date
Kevin Chyn
17c78b63e0 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: I5ca66b5d001708cbd9b28a125c383fe2fb6f4de1
2021-06-16 06:33:50 +00:00
Kevin Chyn
70fabc4900 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: I4e7bbaea57094840b1ae0b0a1184bcb759a913f5
2021-06-16 06:33:07 +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
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
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
Joshua Mccloskey
19baf0df84 Merge "Update multi biometric flow for SUW" into sc-dev 2021-06-16 00:07:16 +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
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
Zimuzo Ezeozue
791f95c8a7 Merge "Turn off transcoding notification by default" into sc-dev am: 653e7c91c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964377

Change-Id: Ifb289ac030f62f3963a81c1808c80ada47c574c5
2021-06-15 13:59:17 +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
5ea704f690 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev am: ab04f86066
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964828

Change-Id: Ia5b3b52894f3df2b4e3bdf655a98e61b94425e9c
2021-06-15 12:49:20 +00:00
TreeHugger Robot
ab04f86066 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev 2021-06-15 12:36:38 +00:00
Peter Wang
130ac0729b Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: I0d1c251e892da779e70c5078cb7cd22af754dd87
2021-06-15 10:18:22 +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
Weng Su
58a651566f [Provider Model] Remove Wi-Fi disconnect action
Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: I964bf8de4f5eee1523943876567bf565ccb7f995
2021-06-15 17:43:31 +08:00
TreeHugger Robot
57c1cb6209 Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: I8757ccca71cf6efd33dc8b3f539fad4dadd35ff1
2021-06-15 09:36:10 +00:00
TreeHugger Robot
c497a9602b Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: I700f9a5a773862358e19ded911f634962571aa4f
2021-06-15 09:36:04 +00:00
TreeHugger Robot
2ff8b363da Merge "Add loading progress to Internet Settings" into sc-dev 2021-06-15 09:24:27 +00:00
TreeHugger Robot
1ce0d1117e Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev 2021-06-15 09:23:58 +00:00
TreeHugger Robot
339c1b5d12 Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: I489bda723baaeedec879e5d973d5b5f066086455
2021-06-15 09:19:13 +00:00
TreeHugger Robot
153c3a1dc2 Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev 2021-06-15 09:11:18 +00:00
TreeHugger Robot
6d4d55fb3b Merge "Revert "[Provider Model] Add WiFi toggle in internet panel"" into sc-dev am: 68079c7bd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964819

Change-Id: I00e47b04f4e158d1f2f847b7e36b45ac4711851f
2021-06-15 08:16:37 +00:00
ykhung
64112f65fd [GAR] fix spoke a percentage number is not the same as displayed content
in the Battery Saver and Battery Share, we have customized rule to map
the seekbar progresss to another displayed percentagge value, which
cause the a11y will speak the incorrect state, since the state is
referenced the original progress value. we add a method to override it
into our cusromized value.

Bug: 187780942
Bug: 190958777
Test: make SettingsGoogleRoboTests
Change-Id: Ie630ac03e66c2f8da1df00d6d2616b2e6979aa3e
2021-06-15 08:09:17 +00:00
TreeHugger Robot
68079c7bd2 Merge "Revert "[Provider Model] Add WiFi toggle in internet panel"" into sc-dev 2021-06-15 07:59:57 +00:00
Wesley Wang
4dc71183a3 Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151

Change-Id: I5ad77479d5cbc6d5c230bbea5db5fac198e957de
2021-06-15 04:58:04 +00:00
Wesley Wang
f2a884b8be Merge "Make App info page support new battery entry" into sc-dev 2021-06-15 04:41:16 +00:00
Weng Su
28e5f4c2fc Revert "[Provider Model] Add WiFi toggle in internet panel"
This reverts commit 04a4060225.

Reason for revert: Need to split the functions for cherry picking to different branches

Bug: 189912933
Change-Id: I8c30a87c83e23b3df88ce2689d500626e1dd28d2
2021-06-15 04:10:13 +00:00
Joshua Mccloskey
785203d51a Update multi biometric flow for SUW
Currently, if a user has completed a fingerprint/face enrollment
in SUW and they press the back button, we show the UI for each, and
it fails with no error.

This change makes it so that if a user completes 1 fingerprint or 1
face enrollment, it will no longer try and enroll them again if they
have failed.

Test: Manual
Bug: 191073296
Change-Id: I020c423b5d34797cd7c8be66a2e24051135c9be0
2021-06-14 19:59:23 -07:00
TreeHugger Robot
c2546ecc86 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: Ica8a071cf361e64f899e786ff1658c1a9b12fba4
2021-06-15 01:10:48 +00:00
TreeHugger Robot
052ae78759 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev 2021-06-15 00:57:46 +00:00
Joe Bolinger
0f32ee6122 Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: I74478f61878eaf445e5bf5285d43ec40666d5e28
2021-06-14 16:38:34 +00:00
Joe Bolinger
a72230977d Merge "Delay invoking biometric prompt." into sc-dev 2021-06-14 16:38:08 +00:00
Zim
3d7118d636 Turn off transcoding notification by default
To aid debugging, we included transcoding progress
notifications. We don't intend to launch with the notifications on by
default so turn it off now in preparation for Android S launch.

The notifications can still be enabled in the developer options with:
Settings > System > Developer options > Media transcoding >
Show transcoding notifications

Test: Manual
Bug: 190562454
Change-Id: Icab62cb91fdf22e5308d0c4bbc710b88a51170d3
2021-06-14 14:18:04 +01:00
PETER LIANG
a989ce32ec Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: Ia7f3f1bd9e35ec1233433dd07b4c023cb0a113ef
2021-06-14 03:11:28 +00:00
PETER LIANG
a96c844df5 Merge changes from topic "a11y_image_preference_bc" into sc-dev
* changes:
  Update the Lottie images for Accessibility features.
  Update the material next style for AnimatedImagePreference.
2021-06-14 02:55:07 +00:00
TreeHugger Robot
52a20f10c6 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: I44d170baf79a4418fba5c3ec30fe628131c177c7
2021-06-12 23:44:33 +00:00
TreeHugger Robot
cd6c64a5c7 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev 2021-06-12 23:31:12 +00:00
Jason Chang
0ec543dd95 Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130

Change-Id: Id11fd3cf73c7d657d8f05d4a803f2f0c5b03364e
2021-06-12 11:59:11 +00:00
Jason Chang
691a29062a Remove redundant swipe down notification and one handed sub settings am: 1c310ef44b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797789

Change-Id: I255e03fe5dafd7282ca580d6278d5460919d084c
2021-06-12 11:59:06 +00:00
Jason Chang
5213fbced1 Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev
* changes:
  Update key visual changes for one handed mode settings
  Remove redundant swipe down notification and one handed sub settings
2021-06-12 11:49:16 +00:00
TreeHugger Robot
ebfa2804dc Merge "[Provider Model] Add WiFi toggle in internet panel" into sc-dev am: 38df9ce8bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880638

Change-Id: Iab8f2b73218d69b892ba0af840eb6d1e7cb5acaa
2021-06-12 10:52:45 +00:00
TreeHugger Robot
38df9ce8bb Merge "[Provider Model] Add WiFi toggle in internet panel" into sc-dev 2021-06-12 10:47:34 +00:00
TreeHugger Robot
4195e8c488 Merge "Fixing the crash when tapping the "Downloaded apps" in Accessibility page." into sc-dev am: 90f780ac51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934756

Change-Id: I1551aed4e47842c77feb2552a5cb6a5b60a92d5e
2021-06-12 10:31:03 +00:00
TreeHugger Robot
90f780ac51 Merge "Fixing the crash when tapping the "Downloaded apps" in Accessibility page." into sc-dev 2021-06-12 10:22:42 +00:00
Weng Su
c4eb3b1320 [Provider Model] Hide W+ network if it's inactive
Bug: 187854575
Test: manual test
atest -c CarrierWifiTogglePreferenceControllerTest \
         SubscriptionsPreferenceControllerTest

Change-Id: Ib99bc7fef38a99c1da1e365c2002ad30c617d445
2021-06-12 00:55:10 +00:00