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
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
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
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
575e06dbb1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818
-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: I39c51016f6aa5fd5f6133bf3ef730c68faa39755
2021-06-15 15:13:28 +00:00
Bill Yi
cb28fd1d30
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098
-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: If2412a5d6b1ec925ca9b9e8404b75110519b9809
2021-06-15 15:12:33 +00:00
TreeHugger Robot
51f4ffc818
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-06-15 15:02:11 +00:00
TreeHugger Robot
c2989e3d1c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-15 14:57:42 +00:00
TreeHugger Robot
59205fce57
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-15 14:56:52 +00:00
Bill Yi
af994f1ee2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie1f5759a3bb75dc44970be04baff77093925ef39
2021-06-15 13:50:46 +00:00
Zimuzo Ezeozue
653e7c91c8
Merge "Turn off transcoding notification by default" into sc-dev
2021-06-15 13:49:19 +00:00
Bill Yi
94ab13af15
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8ed8b655dd1025abc355482a2b85489c47f8cb6e
2021-06-15 13:41:45 +00:00
Bill Yi
acf3c5c098
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibdaa7a59ef596ef9bbcd939ba148b62c972100c4
2021-06-15 13:37:16 +00:00
Bill Yi
532ae047f0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia1ba0b60387c6aa399159adb1d5f0f5dc2bb9f79
2021-06-15 13:33:58 +00:00
Bill Yi
e2b8fbafa3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I38b2b159f3e0003a8ad9702a5b24c88cf8b5d7cc
2021-06-15 13:25:35 +00:00
Bill Yi
a333febed9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic1ba09681a73f7f35074acdfcd16e282b4100f8d
2021-06-15 13:20:30 +00:00
Menghan Li
92aaef1dac
Merge "Add strings for use accessibility gesture" into sc-dev
2021-06-15 12:43:16 +00:00
TreeHugger Robot
ab04f86066
Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev
2021-06-15 12:36:38 +00:00
Syaoran Kuo
66eaa371ff
Merge "Fix resource id not match issue." into sc-dev
2021-06-15 10:48:58 +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
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
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
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
menghanli
6fa82981a6
Add strings for use accessibility gesture
...
Bug: 190563948
Test: Manual test
Change-Id: Id9d23bd7a4e4d57b3ab7fb84815cc3df226fc00d
2021-06-15 14:39:15 +08:00
TreeHugger Robot
ffd695983c
Merge "Fix test failures" into sc-dev
2021-06-15 06:17:52 +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
Midas Chien
9598398df3
Merge "Change strings for force highest refresh rate in Developer options" into sc-dev
2021-06-15 04:00:43 +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
Arc Wang
ff5bb849ba
Fix test failures
...
Add the color contextual_card_background to fix.
Bug: 190868608
Bug: 190870129
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SliceContextualCardRendererTest
make RunSettingsRoboTests ROBOTEST_FILTER=SliceHalfCardRendererHelperTest
Change-Id: I430dab9c72a8f4efb2402e44fd015c1c1ce0f7e6
2021-06-15 10:25:06 +08:00
TreeHugger Robot
052ae78759
Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev
2021-06-15 00:57:46 +00:00
Peter Wang
5a6655d356
Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev
2021-06-14 17:58:40 +00:00
TreeHugger Robot
46bcf5ae17
Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev
2021-06-14 17:01:00 +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
TreeHugger Robot
c7f8315e66
Merge "Remove the divider on "Pair new device"." into sc-dev
2021-06-14 08:09:16 +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
cd6c64a5c7
Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev
2021-06-12 23:31:12 +00:00