Commit Graph

91325 Commits

Author SHA1 Message Date
TreeHugger Robot
964ef01e94 Merge "Change your to the for lock prompts." into sc-dev am: c8059dc338
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081922

Change-Id: I4cbdc44b5eab97b8d0bd9cd62832bb196200c287
2021-06-24 00:37:44 +00:00
Curtis Belmonte
39c9ad88f6 Use correct string for Face Unlock preference category
Updates the title of the preferences subcategory on the Face Unlock
Settings screen to use the correct string reference.

Test: Manually inspected string on Face Unlock Settings page

Bug: 191923052
Change-Id: Ia8a4a5b8f64bff8e2b764d0ecabe16099d2eba21
2021-06-23 17:37:15 -07:00
Menghan Li
0063746e2b Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev am: b2d7b6e5de am: 4fc3f100ae am: bfb5f7e274
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056863

Change-Id: I046592b4024aae935a52c9700f93f44855de44fa
2021-06-24 00:29:07 +00:00
Menghan Li
99b90f9504 Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev am: b2d7b6e5de am: c4f8d2e5bf am: 1d77747bf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056863

Change-Id: I1f60432a39b330cb86122629014701c6890dca56
2021-06-24 00:28:51 +00:00
TreeHugger Robot
c8059dc338 Merge "Change your to the for lock prompts." into sc-dev 2021-06-24 00:24:26 +00:00
Menghan Li
bfb5f7e274 Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev am: b2d7b6e5de am: 4fc3f100ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056863

Change-Id: I973d809f9b06c0e8efa50914ebe64a9fc7144093
2021-06-24 00:17:53 +00:00
Menghan Li
1d77747bf0 Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev am: b2d7b6e5de am: c4f8d2e5bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056863

Change-Id: Icd77f7ff6ed85b91a4ecdd56fcbc25271eefa1e0
2021-06-24 00:17:31 +00:00
Menghan Li
0cc32023e5 Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev am: b2d7b6e5de am: 7417f49ebd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056863

Change-Id: I090f83e8ac98b9494ac8b3236624c3c5284127aa
2021-06-24 00:17:04 +00:00
Joshua Mccloskey
9a13bb445c Updated fingerprint bad calibration string
Test: Verified that the string appears during fp enrollment.
Bug: 189133688
Change-Id: I3e62788d88a29b88b7102764161be1c0f96e0e5f
2021-06-23 17:11:05 -07:00
Menghan Li
c4f8d2e5bf Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev am: b2d7b6e5de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056863

Change-Id: Ie8b6955ce1ea129b6940ff40b971ffe989aff6b0
2021-06-23 23:59:55 +00:00
Menghan Li
7417f49ebd Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev am: b2d7b6e5de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056863

Change-Id: I7541fd4c196c947912f1afd7cc19d0a8bb7f4272
2021-06-23 23:59:07 +00:00
Menghan Li
4fc3f100ae Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev am: b2d7b6e5de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056863

Change-Id: I8f709c24b3ef6799ee770286f64850957ddc48e3
2021-06-23 23:59:03 +00:00
Menghan Li
b2d7b6e5de Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev 2021-06-23 23:49:40 +00:00
Joe Bolinger
f144de8909 Change your to the for lock prompts.
Bug: 188847063
Test: N/A
Change-Id: I2c3432cc1ef12d4dc265f71a465a7ebb6df4c666
2021-06-23 16:19:00 -07:00
Curtis Belmonte
d3a07c29bf Fix face education UX for both grid and traffic light
Makes the following adjustments to the UI of the Face Unlock education
screen for both the grid and traffic light enrollment flows:
- Fixes issues with text being overlapped by illustrations
- Prevents views from moving vertically due to state changes
- Ensures no scroll is required for default locale and scaling
- Adjusts the color and content of the a11y setup toggle

Test: Manual:
1. Start grid-based face enrollment (e.g. from Settings > Security)
2. Proceed to "How to set up Face Unlock" screen
3. Tap "Setup for limited vision or head motion"
4. Toggle "Setup for limited vision or head motion" switch off and on
5. Repeat steps 1-4 for traffic light face enrollment

Fixes: 191105436
Fixes: 191317385
Change-Id: Ie80f5b3130b5b0aeceb889f53cc2dec8c7423e47
2021-06-23 16:14:40 -07:00
Quang Luong
e619d227c9 isCarrierNetworkActive() should check if the carrier network is default
WifiPickerTrackerHelper should use MergedCarrierEntry.isDefaultNetwork()
for isCarrierNetworkActive().

Bug: 191090765
Test: atest WifiPickerTrackerHelperTest
Change-Id: I44d8eed3af019a8d6a30a4b743cad468d1f0469b
2021-06-23 16:08:47 -07:00
menghanli
880e1898fc Show one line of footer content change in Accessibility button page when the user is in gesture nav.
Bug: 190563948
Bug: 191733125
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityButtonFooterPreferenceControllerTest
Change-Id: I13ce0b3331835469d6eb9a6263a3a01f821814a8
2021-06-24 05:24:14 +08:00
Peter_Liang
2811428165 Replace the AnimatedImagePreference with IllustrationPreference.
Bug: 190585192
Test: manual test
Change-Id: I4a6d1f5bbfd50f5586bfa39a8586442bd7b2a78d
2021-06-24 00:26:29 +08:00
TreeHugger Robot
abc3edc201 Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev am: 22f6857a6a am: 2924989c46 am: 0d64ba7eb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076801

Change-Id: Ibaddbdb7ecb5d32e03143fd9ff72ea050eb8af58
2021-06-23 16:23:51 +00:00
TreeHugger Robot
71b08a67fc Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev am: 22f6857a6a am: 35e410b52b am: ff2a0ffad2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076801

Change-Id: Ibdb583baa85528216d7d350fea43a5158f5d5b94
2021-06-23 16:22:24 +00:00
TreeHugger Robot
0d64ba7eb8 Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev am: 22f6857a6a am: 2924989c46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076801

Change-Id: Iff3b80c6bd5d03b47af9cfbb99359492b0e64d30
2021-06-23 16:04:30 +00:00
TreeHugger Robot
ff2a0ffad2 Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev am: 22f6857a6a am: 35e410b52b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076801

Change-Id: I4b6ccc70cb734ba01b1014d7c4f5489aa6487a68
2021-06-23 16:04:11 +00:00
TreeHugger Robot
8f11a6799f Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev am: 22f6857a6a am: 4cbdf9d17a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076801

Change-Id: I20c21a9f47793f371c23cd76dbe8402e8e5ac4f5
2021-06-23 16:03:44 +00:00
TreeHugger Robot
35e410b52b Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev am: 22f6857a6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076801

Change-Id: I295986d82ed772e9c86c7eb1df2080874f6fa360
2021-06-23 15:44:59 +00:00
TreeHugger Robot
4cbdf9d17a Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev am: 22f6857a6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076801

Change-Id: I201e63e053b90198854f52d04b7379dc43d6103c
2021-06-23 15:44:08 +00:00
TreeHugger Robot
2924989c46 Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev am: 22f6857a6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076801

Change-Id: I7896e2c43083c812376a6ce45d096ea73c23fec2
2021-06-23 15:43:54 +00:00
TreeHugger Robot
22f6857a6a Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev 2021-06-23 15:12:19 +00:00
PETER LIANG
7a90e28e69 Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev am: a458f9cdea am: d0ac40c376 am: db8d2773f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064551

Change-Id: Ifa68eaa23bfeab7d755c65e2658f208c50b13fc1
2021-06-23 15:08:16 +00:00
PETER LIANG
19be751283 Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev am: a458f9cdea am: b265fa23e4 am: 6a70f11010
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064551

Change-Id: Ib185da781255a8f2bdd5adb67ccd1e7603f4839c
2021-06-23 15:08:07 +00:00
PETER LIANG
db8d2773f5 Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev am: a458f9cdea am: d0ac40c376
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064551

Change-Id: I19c9a4cb72f97fb713a1fa85e4f3c8f8ee8bf2cc
2021-06-23 14:55:50 +00:00
PETER LIANG
6a70f11010 Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev am: a458f9cdea am: b265fa23e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064551

Change-Id: Ib8cade1bb87c52386327e17d62c0e6b840017d07
2021-06-23 14:55:25 +00:00
PETER LIANG
acd61be14b Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev am: a458f9cdea am: 97b448424e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064551

Change-Id: I0ec90fd7a2c1822f843d5954448d5bb2af80a2cf
2021-06-23 14:54:52 +00:00
Jeff Sharkey
7025a83f39 Update to modern Bluetooth permissions.
The Settings app offers several Bluetooth intents, and they need to
be updated to enforce the new "Nearby devices" runtime permission
model, since the old BLUETOOTH and BLUETOOTH_ADMIN permissions have
been deprecated.

Bug: 191174082
Test: TH
Change-Id: I0d812f486bc3dadc517d5b04d3082d4f56f60ef4
2021-06-23 08:53:05 -06:00
PETER LIANG
b265fa23e4 Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev am: a458f9cdea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064551

Change-Id: I7e17d32624aab42fa101f03c2848c88d2aa01d3d
2021-06-23 14:37:58 +00:00
PETER LIANG
d0ac40c376 Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev am: a458f9cdea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064551

Change-Id: I9a5ca4e78e710547131d1e3e13dc7ae5fac6ee99
2021-06-23 14:37:05 +00:00
PETER LIANG
97b448424e Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev am: a458f9cdea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064551

Change-Id: Ia79c77dd380df5c19458491b507d8692ba4cfcb3
2021-06-23 14:37:03 +00:00
PETER LIANG
a458f9cdea Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev 2021-06-23 14:22:09 +00:00
Weng Su
9395d39063 [Provider Model] Remove Wi-Fi switch menu in internet panel
- Remove "Turn on/off Wi-Fi" menu in internet panel

- Don't show the default "See more" menu in internet panel also.

Bug: 189912933
Test: manual test
atest -c InternetConnectivityPanelTest

Change-Id: I3a9927e356e0f7e534b1e2ba848d2b6d2a5bd858
2021-06-23 12:47:06 +00:00
Jeremy Goldman
84d94dc01d Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d am: a72deb37bd am: f02c0e2deb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: I83885a2ea66a64b22cb5da4029095d8e493e94e8
2021-06-23 10:58:41 +00:00
TreeHugger Robot
609fdc112b Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 am: 673ee6ed51 am: 14aac782a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: I2359d0b407ea2b710d6e6ea8a1b2f7572a6728d6
2021-06-23 10:58:35 +00:00
TreeHugger Robot
bb8a7f1c1f Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: 137e14b6af am: 3a4fcb300f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: I419cf1d717ffe46ce75c2642d4f045d9eedf0c1f
2021-06-23 10:58:30 +00:00
Jeremy Goldman
fc53d97dfe Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d am: 5f439a69e3 am: bd01f6b247
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: Ife813e719d06ea71d770efe9074f83e998e85f77
2021-06-23 10:58:24 +00:00
TreeHugger Robot
21d3286d5a Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 am: 70af2a91a9 am: 1bc83c7062
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: I806b863636a2a240658a7037678fc23f593f24e8
2021-06-23 10:58:18 +00:00
Automerger Merge Worker
d17d296fe5 Merge "Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: 55b7b6b508" into sc-v2-dev-plus-aosp am: 7d5192ad0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: Ibca7b7021740a54ce8a845624f67f166dbb4f814
2021-06-23 10:58:13 +00:00
TreeHugger Robot
d6a80a443b Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: 6f7dc069c3 am: 86c9dedfb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: Ibc70d75e243afb072a67f1b81c72d232c8df9a66
2021-06-23 10:58:04 +00:00
TreeHugger Robot
4316fb45dc Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: 3f3034c2db am: 5764de71ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: Ibe5de8797f5372a0db037036a2a2a33134e71258
2021-06-23 10:57:50 +00:00
Jeremy Goldman
f02c0e2deb Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d am: a72deb37bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: I13613d3a939968c57c70e8aba15780a9d5e7e61a
2021-06-23 10:48:19 +00:00
TreeHugger Robot
14aac782a5 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 am: 673ee6ed51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: I774d439e5c9d6a48c515dbdf5c36e9833c88d89a
2021-06-23 10:48:14 +00:00
TreeHugger Robot
3a4fcb300f Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: 137e14b6af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: I8d6c57741d63e2e8b4f58f3bf53474f77cb8c0b1
2021-06-23 10:48:10 +00:00
Jeremy Goldman
9faf67d489 Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d am: e0cb5e6c51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: I8e2c5fc303173ede88c46659ed9f7e6769fe62ab
2021-06-23 10:47:49 +00:00