Commit Graph

38092 Commits

Author SHA1 Message Date
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
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
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
TreeHugger Robot
3b935d7543 Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da am: 43dad72bff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

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

Change-Id: I7f9cf20b6aab539555df3e9644f2d499252f3467
2021-06-15 09:48:18 +00: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
5d587bfb79 Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2 am: 033a6c3eec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: I9114c64261818c7628dae0f78e3b88b2f2979db3
2021-06-15 09:31:47 +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
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
bc895fd254 Merge "Revert "[Provider Model] Add WiFi toggle in internet panel"" into sc-dev am: 68079c7bd2 am: d441988494
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964819

Change-Id: I7bd0881b5314b0a7a82da64875aab5a990382871
2021-06-15 08:25:25 +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
027d900daf Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be am: f294981a7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151

Change-Id: Ia289536f84e1b0d6423c9dda42de5c52aeb0ef15
2021-06-15 05:12:05 +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
bd4ea47f6d Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 am: e919947ad0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: I61d13da7ba7f6edb6a19b790efc9543065b15c28
2021-06-15 01:26:45 +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
d90c8bc2df Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d am: 78a129a37a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: Ia670341cb8625fac37e008b19e1f18a4ff21911c
2021-06-14 16:51:45 +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
2ef3b0b264 Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5 am: 39911eee17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: Ib2e1225408a04bad0880dc45903962a47ab1f788
2021-06-14 03:30:14 +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
bf71488e98 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7 am: eaa98e659a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: I3bf8a0982e9dcc7a028fd9c2a47ddf06d858df9a
2021-06-12 23:57:01 +00:00