Commit Graph

83019 Commits

Author SHA1 Message Date
menghanli
f07aa0fa90 Add back the shortcut dialog content for accessibility gesture
Below components are updated.
1. The dialog title, content, and customized link when edit shortcut.
2. The shortcut preference summary in Setting page.
3. The tutorial title and content when shortcut on.

Partial rollback from commit 5fe2cdcf87

Bug: 190563948
Test: Manual test
Change-Id: I5e39b46c9387b4bf5a10f14453be9988d8b7fc9c
2021-07-06 01:05:11 +00:00
Curtis Belmonte
a8d6dba649 Merge "Fix face education UX for both grid and traffic light" into sc-dev am: 147fa2f159
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15084564

Change-Id: I5f7ef4965a008e4d70fac9338b3a6b65e445fca9
2021-06-24 01:13:30 +00:00
Curtis Belmonte
147fa2f159 Merge "Fix face education UX for both grid and traffic light" into sc-dev 2021-06-24 00:57:31 +00:00
Jeremy Goldman
1d2831122a Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into sc-dev am: 7a6ff6942c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007770

Change-Id: I985d3a55d15a0fb53f6d62b06644f2e30f7c754e
2021-06-24 00:42:41 +00:00
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
c8059dc338 Merge "Change your to the for lock prompts." into sc-dev 2021-06-24 00:24:26 +00: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
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
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
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
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
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
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
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
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
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
Weng Su
362bf07919 [Provider Model] Add Wi-Fi toggle in internet panel
- Add a new slice row for Wi-Fi toggle in the network lists

- Increase the maximum number of network lists to 6

Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Ie25e108573f264ab3a94fc6804b9d46d855eeea1
2021-06-23 17:19:34 +08:00
Weng Su
627efc46a2 [Provider Model] Show carrier network to internet preference
- If the connected network is the merged carrier Wi-Fi, then show
carrier network to internet prefernce.

Bug: 191091045
Test: manual test
atest -c InternetUpdaterTest

Change-Id: Iad3869f086ea0a4d0607691c6709ee12567831c7
2021-06-23 15:55:24 +08:00
Jason Hsu
69dd166091 Merge "Fix "Dark theme" can not be searched by keywords" into sc-dev am: 200bc6e161
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067018

Change-Id: Idf7132b278a7e484c86333eea435000e7ec496ae
2021-06-23 06:26:23 +00:00
TreeHugger Robot
2c2be0c78a Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev am: 94bc9d4c31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048199

Change-Id: I4502c158e435991cead35f56750eee3bd00ef173
2021-06-23 06:25:59 +00:00
TreeHugger Robot
19c1872cfd Merge "Fix missing share context option in settings app" into sc-dev am: 60b63d549a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14957028

Change-Id: I9c2bf755f3ef675aceac7cd2782a6d3f4a394bcd
2021-06-23 06:25:45 +00:00
Jason Hsu
200bc6e161 Merge "Fix "Dark theme" can not be searched by keywords" into sc-dev 2021-06-23 06:04:01 +00:00
TreeHugger Robot
94bc9d4c31 Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev 2021-06-23 04:24:29 +00:00
jasonwshsu
aab1b7412a Fix "Dark theme" can not be searched by keywords
Root cause: Misadded into night display

Solution: Add them back into dark ui

Fix: 191828775
Test: manual test
Change-Id: I93cc0dd6231602f4705a894a86dbf4cc278766d6
2021-06-23 12:09:58 +08:00
TreeHugger Robot
60b63d549a Merge "Fix missing share context option in settings app" into sc-dev 2021-06-23 03:47:39 +00:00
Stanley Wang
bb28038f37 Merge "Refine the About phone page." into sc-dev am: 95f2a11593
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056865

Change-Id: Id7c4282c9c1a3f7600def2a0ae592b4ef14eea87
2021-06-23 03:17:55 +00:00
Stanley Wang
95f2a11593 Merge "Refine the About phone page." into sc-dev 2021-06-23 03:00:19 +00:00
Yi Jiang
aee4809820 Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779

Change-Id: I22c6386b7c25d761b9d01a66788dd9d25643e21c
2021-06-22 17:03:15 +00:00
Yi Jiang
2de946e584 Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev 2021-06-22 16:59:20 +00:00
Matt Pietal
4176d9fe01 Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627

Change-Id: Ia6f7c24b2d93426366ac031ae766e78db678e5d9
2021-06-22 16:45:50 +00:00
Arc Wang
af29784f34 Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055

Change-Id: I022679cace9a3edf7da86fca4711bbdc48ec0536
2021-06-22 16:45:45 +00:00
Matt Pietal
c07d6ba8ee Merge "Restore lockdown setting" into sc-dev 2021-06-22 16:41:44 +00:00
Arc Wang
b0e55afc95 Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev 2021-06-22 16:25:13 +00:00
TreeHugger Robot
e79286902d Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866

Change-Id: If4c82a4c6d23e06d3b6351fee45109c3631a46ae
2021-06-22 15:11:38 +00:00
TreeHugger Robot
765dfcb761 Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681

Change-Id: Ied5371f7d59f521720634ff53ed7d6c77ddabf5e
2021-06-22 15:11:25 +00:00
tim peng
a59db06434 Merge "Not support group volume control" into sc-dev am: 49bf60df47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782137

Change-Id: I1381127514e3f091cec72b799e7e46364ad12352
2021-06-22 15:08:57 +00:00
TreeHugger Robot
6d459fbfee Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686

Change-Id: I09003d3d58b1afe63d02155fc9e77d9f9e9a5a69
2021-06-22 15:06:19 +00:00
Joshua Mccloskey
6ca804bea3 Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458

Change-Id: Iffa32888446502dbfbc5fe057a399611c77f8de4
2021-06-22 14:57:14 +00:00
Matt Pietal
7cfd8e3cec Restore lockdown setting
This was removed in error while adding wallet/controls options in
ag/14353975

Bug: 190800943
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: Id73a584d7016cf1e649dcbceeba4e81aaa2370cc
2021-06-22 10:56:20 -04:00
TreeHugger Robot
20faa89e15 Merge "Revert transition codes from the base activity" into sc-dev 2021-06-22 14:11:28 +00:00