Commit Graph

37632 Commits

Author SHA1 Message Date
Arc Wang
ba41bfb521 Merge "Fix profile tab text contrast problem" into sc-dev am: 8c8b79dab5 am: 1966d6c336
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165937

Change-Id: I85ed053c2d843fe04ad20c4495bc29dc558fed32
2021-07-02 10:36:05 +00:00
Arc Wang
3c77faf5b0 Merge "Fix incorrect storage size in Storage Settings" into sc-dev am: 68caefba32 am: e29c4da7d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175229

Change-Id: I061511b776920ca570d1750c14abbaa836b873d1
2021-07-02 10:35:59 +00:00
Arc Wang
8c8b79dab5 Merge "Fix profile tab text contrast problem" into sc-dev 2021-07-02 10:05:21 +00:00
Arc Wang
68caefba32 Merge "Fix incorrect storage size in Storage Settings" into sc-dev 2021-07-02 10:05:16 +00:00
Tom Hsu
bd1e9fe0b4 Merge "[Settings] Prevent NPE from getting MobileIconGroup instance." into sc-dev am: c09f986580 am: 2e4cb89e76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173454

Change-Id: Ied4ed485e3b255eb3d8e114d6070c8392f55ba9a
2021-07-02 09:48:08 +00:00
Tom Hsu
c09f986580 Merge "[Settings] Prevent NPE from getting MobileIconGroup instance." into sc-dev 2021-07-02 09:10:51 +00:00
Jernej Virag
875aba5a82 Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev am: 1d2371eecd am: ada2302bd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175451

Change-Id: I24fd65026297fd671207a18705e215730eadf2b8
2021-07-02 09:08:35 +00:00
TreeHugger Robot
14cbf021fd Merge "Password settings: Fix work profile" into sc-dev am: e6cff5497d am: febdfba6e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153211

Change-Id: I0692f3de1e61c12fef73d08a0072f99335dc9ad7
2021-07-02 09:08:30 +00:00
Jernej Virag
1d2371eecd Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev 2021-07-02 08:51:17 +00:00
TreeHugger Robot
e6cff5497d Merge "Password settings: Fix work profile" into sc-dev 2021-07-02 08:42:26 +00:00
TreeHugger Robot
5046ed6a6a Merge "Move selectability to switch from container" into sc-dev am: 235006fc35 am: cbc37a271a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372

Change-Id: I5a1f61b64afda36d49693efc7066a0f46932727f
2021-07-02 08:35:53 +00:00
TreeHugger Robot
235006fc35 Merge "Move selectability to switch from container" into sc-dev 2021-07-02 08:03:25 +00:00
TreeHugger Robot
74f747b1fd Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev am: f1b07d7ddd am: a74806eec9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652

Change-Id: Ic6a4b06ecc3621a535b588547399a9c4a48ebeda
2021-07-02 06:52:42 +00:00
George Chang
ab28ada66b Merge "Separate NFC on/off strings" into sc-dev am: cd4a4ad90a am: 873084ac09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15182819

Change-Id: I7a7f98b1abc85905b5ad20ec1dc4ae7cb4058ce7
2021-07-02 06:52:21 +00:00
TreeHugger Robot
f1b07d7ddd Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev 2021-07-02 06:40:15 +00:00
George Chang
cd4a4ad90a Merge "Separate NFC on/off strings" into sc-dev 2021-07-02 06:23:03 +00:00
TreeHugger Robot
096f77298b Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26 am: 0b95e8c9c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314

Change-Id: Ieb069a51f1a5d0f30fa215ec8cbd3a450cc01dfa
2021-07-02 05:52:03 +00:00
TreeHugger Robot
de02870306 Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5 am: d30e518f0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945

Change-Id: I091bedaccfde3ee417d2e9da758583495ce10b1d
2021-07-02 05:51:59 +00:00
TreeHugger Robot
77f0dbaa26 Merge "Correct the choose screen lock page" into sc-dev 2021-07-02 05:26:38 +00:00
TreeHugger Robot
65c9b03fb5 Merge "Fix multiple biometrics enrollment flow" into sc-dev 2021-07-02 05:26:18 +00:00
Yanting Yang
9fd3223b5a Merge "Remove stale search result about "Recent location requests" page" into sc-dev am: 62315005fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172993

Change-Id: I8063aed6ceeaf85500d331ce793f38135abf4a9c
2021-07-02 04:09:17 +00:00
Yanting Yang
62315005fd Merge "Remove stale search result about "Recent location requests" page" into sc-dev 2021-07-02 03:59:29 +00:00
George Chang
96b5af7e39 Separate NFC on/off strings
For pt-BR, it needs a different gender when we are referring to "NFC".

Bug: 189314407
Test: check On/Off strings
Change-Id: I87da43c66a65b3ef2fcd9c57632b36302d9920e8
2021-07-02 11:20:03 +08:00
Arc Wang
25880d0d0e Fix incorrect storage size in Storage Settings
From Android S, Storage Settings queries file sizes
from MediaProvider, it's not necessary to count size
data from getExternalStorageStats when calculating
size data.

Bug: 185542752
Test: make RunSettingsRoboTests ROBOTEST_FILTER=testMeasurementCompletedUpdatesPreferences
      manual
      1. Connect device to PC via USB File transfer.
      2. Copy large files from PC to device.
      3. Observe size information in Storage Settings.
Change-Id: I43cbec764e97f5003a4ec981717c9f213a21b614
2021-07-02 10:57:57 +08:00
Abel Tesfaye
f60885a040 Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate
Bug: 191924078

Test: locally on crosshatch
Change-Id: I8464860c3d1d59c5d4549e7c488457e92054dbba
2021-07-01 19:17:37 +00:00
Julia Reynolds
94ffc288bd Move selectability to switch from container
To better work with SwitchAcccess

Test: manual with Switch Access (with labels on) and Talkback
Fixes: 189074205
Change-Id: Iafbc4eca9bce8c979ec16a743509b46727cd9eb6
2021-07-01 14:08:39 -04:00
TreeHugger Robot
18f3c51a44 Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365

Change-Id: Ife7873e34cb5410a36acb0a95abcd4e183ee12e0
2021-07-01 17:49:36 +00: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
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
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
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
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
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
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
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
a3852ffc75 Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685

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

Change-Id: I5b7855ecd5a5fe647deb6dd2df06dd5c803a5f38
2021-07-01 08:32:46 +00:00
Tom Hsu
f5a55229fa Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev 2021-07-01 08:28:15 +00:00
Alex Johnston
4174cf1b28 Merge "Fix Settings usb preference search" into sc-dev 2021-07-01 08:26:51 +00:00
Arc Wang
566d06af22 Fix profile tab text contrast problem
Spec specify textColorSecondary of default state,
however, TabLayout uses a not expected state of the color.

This change sets default state color of textColorSecondary
instead of textColorSecondary.

Bug: 189793243
Test: manual visual
Change-Id: I025ffac68505016f4c4ffb7e1c0b2ff86308d3be
2021-07-01 07:54:29 +00:00
Wesley.CW Wang
15ca9a632f Update filter logic for BatteryDiffEntries
- Use user id and package name to query the battery entry list instead of uid, to handle the
 cases which enter app info page without uid like launch icon -> app
 info

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I665e57ff3eabf23485455fb2e1af2e0376af1e40
2021-07-01 15:48:23 +08:00
Jason Chiu
ab902d4d84 Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I14b3f1890c9b278f21e781c2a9348d57528e8b29
2021-07-01 07:24:42 +00:00
Jason Chiu
1f4eb8fbcc Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev 2021-07-01 07:10:56 +00:00
changbetty
b453e44bf8 Add Adaptive Connectivity switch on/off string for fixing string gender
Bug: 189234188
Test: Manual test
Change-Id: I8a3df2a0f4b364e4bc31e0efd116312b5fdf3b42
2021-07-01 14:57:52 +08:00
Mill Chen
e24255fe7e Fix multiple biometrics enrollment flow
Suppose both face auth and fingerprint auth exist in a device, the setup
flow will skip fingerprint enrollment when a user skips to register
face data on the face enrollment education page. Updated the skip button
method and make the flow move on to fingerprint enrollment if a use
doesn't want to register face data.

Fix: 186084024
Test: manual verified
1) Reset device and start from SUW
2) Press skip button on the face unlock education page
3) The next flow should be fingerprint enrollment intro page

Change-Id: I037ae68f39f5fdbf62ea95b998621c7f7df31b43
2021-07-01 14:45:33 +08:00