Commit Graph

85601 Commits

Author SHA1 Message Date
TreeHugger Robot
d098a72c8d Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7 am: 45a56735d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930

Change-Id: Id82d9e54c2c5a421eb7210ccbf8592994e46235e
2021-07-01 17:49:01 +00:00
Curtis Belmonte
4cf13de04d Adjust UI of face and fingerprint enroll intro pages
Changes the appearance and spacing of the face and fingerprint unlock
intro/consent pages to be consistent with one another and more closely
match the latest mocks.

Test: Manually tested face and fingerprint enrollment

Fixes: 192475206
Change-Id: I4d41ddc15dc1a6be818762a286f06470344cf819
2021-07-01 10:38:25 -07:00
TreeHugger Robot
af63867d08 Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev 2021-07-01 17:35:51 +00:00
Peter Wang
494c68e3cf Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"
This reverts commit eba8857094.

Reason for revert: Issue not urgent enough to go in S, will resubmit to master

Bug: 185553806
Change-Id: Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9
2021-07-01 17:35:43 +00:00
TreeHugger Robot
45a56735d1 Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930

Change-Id: I8c1f907ff8dca2660a6d32371f57dfe31167031e
2021-07-01 17:29:13 +00:00
Jernej Virag
bb75bb911e Update Prevent Ringing setting to avoid conflict with long press power
Long press power setting overrides Prevent ringing setting key chord. This updates the Prevent Ringing setting to disable it when LPP setting conflicts and adds a string describing why this setting is disabled.

Bug: 191971326
Test: Manually on device
      Unit tests in PreventRingingParentPreferenceController
Change-Id: If9fc8318381def7e4bbd71a0f5db3f38c474cb3d
2021-07-01 17:28:45 +00:00
TreeHugger Robot
6b6e438619 Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930

Change-Id: Ib4810dddb206ac0c4b901924462ee61b11cb832b
2021-07-01 17:28:26 +00:00
TreeHugger Robot
964404b2b7 Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev 2021-07-01 17:17:01 +00:00
Yanting Yang
92a3ef950f Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754 am: c5f29a8c79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: Ie2c8e6fb108d0a46c40dc1e07319bf02079dadbd
2021-07-01 16:52:09 +00:00
Yanting Yang
5d5f002f19 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754 am: 8236794aa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: I3e23528c4fdcc4fd85c5ebaada69cb250eab7a27
2021-07-01 16:43:23 +00:00
Jernej Virag
bce875ee2a Move Prevent Ringing gesture underneath power menu
Bug: 191971326
Test: Configuration change
Change-Id: I0696e96f196ce862288d2d2e752aeefa4d3aa1fd
2021-07-01 16:38:50 +00:00
Yanting Yang
c5f29a8c79 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: I11d4e1a3bb0815a3e3ed43049a01561e7b5b9e89
2021-07-01 16:34:09 +00:00
Yanting Yang
8236794aa5 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: I7e8efcf1f75541e303ca8ed57de4fb5eef3fba73
2021-07-01 16:33:12 +00:00
Yanting Yang
fdc7659754 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev 2021-07-01 16:24:15 +00:00
Alex Johnston
0e898acd4a Add bottom padding to 'Choose a new lock screen'
* Add 24dp padding

Before: https://screenshot.googleplex.com/64sTaMhwqMKQ4CE
After: https://screenshot.googleplex.com/As33LmkLXG7duV5

Bug: 192541032
Test: manual testing (see screenshots)
Change-Id: I4e29e4f776e7be1c42301c39c4844d7ee948eaaa
2021-07-01 16:20:23 +01:00
tom hsu
282b67b1c0 [Settings] Prevent NPE from getting MobileIconGroup instance.
Bug: 187812523
Test: Maunal test.
Change-Id: Ief06c683c1c8a99d4ce2765cd802be221e55820e
2021-07-01 22:32:26 +08:00
Tom Hsu
68991eb7e1 [automerger skipped] Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be37 am: 6ff7306d51 -s ours am: 6e24f125ca -s ours
am skip reason: Merged-In I179c708debcbc31ba9a93e4e434ae810051f5004 with SHA-1 a2402aba83 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1753980

Change-Id: I625106b3de67c27d0bd11f22cc9f6c17f5e0af36
2021-07-01 12:42:32 +00:00
Yanting Yang
007d1b2a57 Remove stale search result about "Recent location requests" page
Based on the new design, RecentLocationRequestSeeAllFragment was no
longer used on Location, but it still implemented the indexable
interface to provide stale search result “Recent location requests”
to Settings Search.

Remove the indexable interface from RecentLocationRequestSeeAllFragment
as a quick fix and also correct the related test method name.

Fixes: 192542283
Test: visual
Change-Id: I1a3df5d7319b8831db2f3d3abba19a11b5a83c81
2021-07-01 20:31:05 +08:00
Tom Hsu
6e24f125ca [automerger skipped] Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be37 am: 6ff7306d51 -s ours
am skip reason: Merged-In I179c708debcbc31ba9a93e4e434ae810051f5004 with SHA-1 a2402aba83 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1753980

Change-Id: I76853bce59f351cec5daa360da0a20fc9bd97e78
2021-07-01 12:27:18 +00:00
Tom Hsu
6ff7306d51 Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be37
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1753980

Change-Id: I317a0e09d0d43cdaa96baead76416d09b018a20a
2021-07-01 12:12:33 +00:00
Tom Hsu
53f081be37 Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." 2021-07-01 12:00:52 +00:00
Stanley Wang
d7825d3627 Update the illustrations of camera gestures.
- Add the new illustrations of quickly open camera.
- Add the new illustrations of flip camera for selfie.
- Remove the old illustration of quickly open camera.
- Remove the old illustration of flip camera for selfie.

Bug: 190807662
Test: robotest and see the UI
Change-Id: I72030731c6d2fe23ff4b21d366151ac4770c656f
2021-07-01 19:59:49 +08:00
Yanting Yang
ed7139fad0 Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning
Since the screen title of the Location Services page is not the same
as the preference title on the Location page, it breaked the page
relation between Location and Location services to lead to the broken
breadcrumbs for Wi-Fi scanning and Bluetooth scanning.

Fixes: 192540579
Test: visual
Change-Id: I9fbc4033517a715e97e534991549a1029ca4e5fa
2021-07-01 19:22:02 +08:00
TreeHugger Robot
ced947e40a Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071 am: e8a6ddc02b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: I63e1b3e1c1685e72b0ced8891dfb321e1f717f5b
2021-07-01 10:58:37 +00:00
Wesley Wang
ddc02bb7c4 Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c am: 72ffa64746
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916

Change-Id: Ic3b0175739873746113d8bb693506f1546b84ee4
2021-07-01 10:58:28 +00:00
TreeHugger Robot
f224fdee29 Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071 am: e2b32bceab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: Iee997b0a3943015e1a60d10757827e82c2728194
2021-07-01 10:58:15 +00:00
Wesley Wang
8a60294b26 Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c am: e71e0176f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916

Change-Id: I9619130bdbdb250d51b51988af308ee4cbf42c2a
2021-07-01 10:57:59 +00:00
TreeHugger Robot
e2b32bceab Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: Idd4de9fb3c9a7d9e97ed54e1fe35d3ce88779a2a
2021-07-01 10:39:25 +00:00
Wesley Wang
e71e0176f0 Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916

Change-Id: If4b2d991ddd95391b987246e40a6b34a5cd5b958
2021-07-01 10:39:16 +00:00
TreeHugger Robot
e8a6ddc02b Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: If658ebeb08b49494eea84a54d71cc72cf093dbdd
2021-07-01 10:38:41 +00:00
Wesley Wang
72ffa64746 Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916

Change-Id: I625f8890a705d6ad0ba3afeca243607a150a1b17
2021-07-01 10:38:29 +00:00
TreeHugger Robot
150ed0b071 Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev 2021-07-01 10:09:08 +00:00
Wesley Wang
a6a4fe474c Merge "Update filter logic for BatteryDiffEntries" into sc-dev 2021-07-01 10:05:38 +00:00
TreeHugger Robot
27d933ed22 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89 am: 19997e4f18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543

Change-Id: I711aa4aa7ca2c0f22fa5051623e3e39daa87c21d
2021-07-01 09:52:35 +00:00
Automerger Merge Worker
d4005a11d0 Merge "Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417 am: 59c5b1898f" into sc-v2-dev-plus-aosp 2021-07-01 09:52:20 +00:00
Betty Chang
8f2de6f092 Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417 am: 59c5b1898f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946

Change-Id: I584300e62d0cf343373d5c16a89c80e93076ea71
2021-07-01 09:52:16 +00:00
TreeHugger Robot
08c4018153 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89 am: b58a2527b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543

Change-Id: I83863100def288efc12a0a1e575b0102e7349ff0
2021-07-01 09:52:14 +00:00
Betty Chang
fa868058b2 Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417 am: 4414631723
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946

Change-Id: Ie343bba241d3e643fa1d346723f9b070c7b8a930
2021-07-01 09:52:03 +00:00
TreeHugger Robot
b58a2527b7 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543

Change-Id: I885a4ffa3d7cc3d416e45bfe20aaf5993857c2af
2021-07-01 09:37:57 +00:00
Betty Chang
4414631723 Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946

Change-Id: I0b2e424022ff77a13af0907b9dbc2723dcf055f9
2021-07-01 09:37:51 +00:00
TreeHugger Robot
19997e4f18 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543

Change-Id: I1abc4d82a36c7b17f21d9a92967da049c87c8d37
2021-07-01 09:36:14 +00:00
Betty Chang
59c5b1898f Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946

Change-Id: I88a61967854113f8311297e116bcfe5dcdf57d9e
2021-07-01 09:35:42 +00:00
tom hsu
58d100c3a0 [Settings] Prevent crash from abnormal behavior for ApnSettings page.
- The problem is user remove SIM when stop in ApnSettings page, and do
 unexpected operation.

 - To figure out this problem, listen SIM absent event and make activity
 finish at this moment.

Bug: 189909956
Test: Manual test.
Merged-In: I179c708debcbc31ba9a93e4e434ae810051f5004
Change-Id: If59f68f595794695600811224cdedb4692b869c0
2021-07-01 17:10:56 +08:00
Jason Chang
d9a4197d9d Change One-handed mode controls states in the Settings pages for
improving better UX experience

According to UX feedback to adjust One-handed mode UI
controls’ status in the Settings page for better UX experience.

Bug: 192171369

Test: manual verified on Settings > System > Gesture page
> System controls page
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedMainSwitchPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedActionPullDownPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedActionShowNotificationPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedPreferenceCategoryControllerTest"

Change-Id: I76242fe70c3ec06cd5e2f9bb059c87293cc686dd
2021-07-01 17:05:27 +08:00
TreeHugger Robot
69e246ab89 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev 2021-07-01 09:02:39 +00:00
Ahaan Ugale
239b58e60a Autofill settings: Fix search
Ia012232ba2856e0757289982bc3045d948ff4aa8 replace the "Autofill service"
preference title with the earlier summary string. The change in title
causes search to not find the preference anymore. This change adds back
the title in xml, which makes search find it again. The Controller code
still overwrites the title with the application name.

Also fixes DefaultAutofillPreferenceControllerTest.

Bug: 192403526
Test: manual - clear Settings Services storage -> search "fill" -> click
 link
Test: make -j64 RunSettingsRoboTests \
 ROBOTEST_FILTER="com.android.settings.applications.defaultapps.DefaultAutofillPreferenceControllerTest"
Change-Id: I9714b3efd2a5a7d9ee7eef345415fa020ef0dc61
2021-07-01 01:58:29 -07:00
Mill Chen
aaa031bd71 Correct the choose screen lock page
The choose screen lock page didn't apply the right theme during the
enterprise flow. That is because an intent extra of setup wizard wasn't
properly passed to the next page. In this change we made sure the intent
extra is able to properly pass to the next page.

We also removed the wrong theme for setup choose a screen lock page
since the wrong theme made this page broken. The setup choose a screen
lock is a sub setting page that wasn't implemented by using SUW library,
so it should not use GlifLayout theme. With this update, the choose a
screen lock page still keeps the background color of Settings, that is
different from the one of setup flow.

Bug: 190499041
Test: manual test
Change-Id: I9dceee6a398c7e7b487dd8e4046f71f76cc50e36
2021-07-01 16:54:00 +08:00
Betty Chang
60d2057417 Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev 2021-07-01 08:53:10 +00:00
Tom Hsu
2c93cf007f Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa am: a3852ffc75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685

Change-Id: Ie6cfaf5fe8bddce37dab6216932d1a46c460aba1
2021-07-01 08:46:31 +00:00
Alex Johnston
2da4e0f94d Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28 am: ab4f1de8f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296

Change-Id: I445f68862ca110ab8cf4a38fd1c2e815fd6dfb76
2021-07-01 08:46:27 +00:00