Jeremy Goldman
7a6ff6942c
Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into sc-dev
2021-06-24 00:40:46 +00:00
TreeHugger Robot
4801c804ba
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: Ib99a9d3e55f527e3fc4adcc95d426112d8477507
2021-06-24 00:38:15 +00:00
TreeHugger Robot
d4a3d14b52
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: I3d02075249299c653e5a017b9c1ff73d839be2b6
2021-06-24 00:37:45 +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
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
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
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
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
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
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
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
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
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
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
bd01f6b247
Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d am: 5f439a69e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771
Change-Id: I89448ee0daad787803e9d04cc00f4cd090dfb853
2021-06-23 10:47:46 +00:00
TreeHugger Robot
1bc83c7062
Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 am: 70af2a91a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792
Change-Id: Id855f19cd171e231ecf90d9d594b806149c2c3eb
2021-06-23 10:47:42 +00:00
Automerger Merge Worker
7d5192ad0f
Merge "Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: 55b7b6b508" into sc-v2-dev-plus-aosp
2021-06-23 10:47:39 +00:00
TreeHugger Robot
2f1afd7d83
Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: 55b7b6b508
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930
Change-Id: I9018efaa52ce217501b5c188260e2385cb6e0c02
2021-06-23 10:47:37 +00:00
TreeHugger Robot
86c9dedfb1
Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: 6f7dc069c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869
Change-Id: I5f8cc290226279d547e272d2d1137053cfe24b96
2021-06-23 10:47:36 +00:00
TreeHugger Robot
5764de71ed
Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: 3f3034c2db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869
Change-Id: Id67b1bd720c833d16de76b7d36023ba567a464ea
2021-06-23 10:47:19 +00:00
Jeremy Goldman
5f439a69e3
Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771
Change-Id: I55f965d4d0e22cca68455eb0a71ee1c1f9894d31
2021-06-23 10:31:21 +00:00
Jeremy Goldman
a72deb37bd
Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771
Change-Id: I6d16a6d94b2ff98d2382f0edf0a6b572fc2c8551
2021-06-23 10:30:19 +00:00
Jeremy Goldman
e68805950d
Merge "Null check added when updating the roaming status." into sc-dev
2021-06-23 10:27:32 +00:00
TreeHugger Robot
70af2a91a9
Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792
Change-Id: I35dfc64db55fa76328ea7848185284d59f03614d
2021-06-23 10:27:26 +00:00
TreeHugger Robot
55b7b6b508
Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930
Change-Id: Ife15d5ec66937c5303b24a74164733838ab3a6fa
2021-06-23 10:27:13 +00:00
TreeHugger Robot
3f3034c2db
Merge "Fix the NPE issue" into sc-dev am: 74babf6e91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869
Change-Id: I154f60cc017cc1ff063459953c8d5171653d69ea
2021-06-23 10:27:02 +00:00
TreeHugger Robot
673ee6ed51
Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792
Change-Id: I821e5cc867d5d0d997c314ae0ee15f7547038c34
2021-06-23 10:26:46 +00:00
TreeHugger Robot
137e14b6af
Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930
Change-Id: Iad43cea522add591f04cf9b8d0fc9149a91cdab0
2021-06-23 10:26:23 +00:00
TreeHugger Robot
6f7dc069c3
Merge "Fix the NPE issue" into sc-dev am: 74babf6e91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869
Change-Id: I48a6e673d3aa12c9e23f3fb4d400356cf7ff9cc7
2021-06-23 10:26:03 +00:00
TreeHugger Robot
b86f0c0472
Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev
2021-06-23 10:19:04 +00:00
TreeHugger Robot
d26416ce81
Merge "[Provider Model] Show carrier network to internet preference" into sc-dev
2021-06-23 10:11:33 +00:00
TreeHugger Robot
74babf6e91
Merge "Fix the NPE issue" into sc-dev
2021-06-23 10:10:22 +00:00
Peter_Liang
e9d0590b24
Fixing the SettingsRoboTest failure of the AnimatedImagePreference.
...
Root cause:
Seem to need lottie raw resource when inflating the LottieAnimationView.
Action:
Use the mock for LottieAnimationView to avoid init when inflating the layout.
Bug: 191251677
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AnimatedImagePreferenceTest
Change-Id: I0197442e5a65b40142b128f28a1c6bcd7cd3a0bd
2021-06-23 18:03:11 +08:00
Alex Johnston
e92f5df3be
Update CA certificate warning to material next spec
...
* Fix colour extraction
* Update landscape mode
* Update logo
Screenshots:
* https://screenshot.googleplex.com/5mwbKLJeFVecrpi
* https://screenshot.googleplex.com/9z62Sw26NX5Zfwu
Bug: 191845997
Test: Manual testing with Settings
Change-Id: Id9988dbce9eabc2b69dba4bd20ca7a6729601147
2021-06-23 10:36:17 +01:00