Commit Graph

82037 Commits

Author SHA1 Message Date
TreeHugger Robot
b3b59d6edd Merge "Refactor ChooseLockGenericController" into sc-dev 2021-05-06 23:59:17 +00:00
Treehugger Robot
9119105da9 Merge "Move myself to the emeritus section" 2021-05-06 22:24:55 +00:00
Rubin Xu
8e4acdbf51 Refactor ChooseLockGenericController
* Move all logics around aggregating password policies
  to the controller
* Replace HIDE_DISABLED_PREFS and MINIMUM_QUALITY_KEY
  with HIDE_INSECURE_OPTIONS as all call sites are just
  using them to hide insecure screenlock options.
* Remove password policy aggregation logic from
  ChooseLockPassword and make it use policies passed in.
* Remove padlock from disabled screen lock options,
  per UX mock.
* Increase char limit for some strings

Bug: 177638284
Bug: 177641868
Bug: 182561862
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Test: 1. set profile password quality/complexity and enroll device lock
      2. set profile password quality/complexity and enroll work challenge
      3. set parent password quality/complexity and enroll device lock
      4. set parent password quality/complexity and enroll work challenge
      5. set profile and parent password complexity, then enroll work challenge
      6. set profile and parent password complexity, then unify work challenge
      7. Enroll device lock during SUW
Change-Id: Iba1d37e6f33eba7b7e8e1f805f8e37aaec108404
2021-05-06 23:09:27 +01:00
Julia Reynolds
c644ded2c5 Merge "Update the theme for Notification history page" into sc-dev am: 7d3c283e27 am: ffde414545
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442218

Change-Id: I72805c258a4b479330c471b48117f9855b3ee63c
2021-05-06 19:27:24 +00:00
Julia Reynolds
ffde414545 Merge "Update the theme for Notification history page" into sc-dev am: 7d3c283e27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442218

Change-Id: I74646710289c980b8b7e59cb4582ccbe32911e89
2021-05-06 18:44:54 +00:00
Yu-Han Yang
bac25a750c Revert "Remove dynamic location settings footer"
Revert submission 13809184-location_footer

Reason for revert: b/187211885

Reverted Changes:
Iaf14044e0:Remove dynamic location settings footer
Ifa6468b11:Remove dynamic location settings footer
If3ab49241:Remove dynamic location settings footer

Bug: 187211885
Test: on device

Change-Id: If9fdefee60d191607ed777ce0046e4cf6d0e4018
2021-05-06 11:38:10 -07:00
Julia Reynolds
7d3c283e27 Merge "Update the theme for Notification history page" into sc-dev 2021-05-06 18:15:00 +00:00
ykhung
f76ba1189a Adopt new battery history map with interpolation method
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I5c45a443d0a72df352d4bb707412328ad009f6d4
2021-05-07 00:25:33 +08:00
Alex Stetson
aff80d1e14 Use shared model for non-system overlay toggle
Allows settings applications on other platforms to re-use values by
migrating to Settings.secure and moving HideNonSystemOverlayMixin to
SettingsLib.

Bug: 184967544
Test: atest SettingsUnitTests
Change-Id: If9aaeca29ebb8b481d75622934503e368d7435d3
2021-05-06 08:28:19 -07:00
Eran Messeri
6f3630c393 Move myself to the emeritus section
As I no longer expect to be working on security-related settings, move
myself to the emeritus section.

Bug: 187395769
Test: N/A
Change-Id: Ic91dd36f6de39ef79f1ced90083e1c5c7836c651
2021-05-06 15:16:40 +01:00
Matt Pietal
8850c3c677 Wallet/controls - Migrate existing settings
Step 2 of 2. Move wallet settings from System -> Gestures -> Power
Menu to Display -> Lockscreen. Split the existing sensitivity setting
into two separate toggles to give users better control of their
privacy settings.

Bug: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display

Change-Id: Ifc390945a45258bbcc3c0a6ac67a0c4a3f7a9e91
2021-05-06 08:35:13 -04:00
TreeHugger Robot
adcdff9e06 Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev am: bbb6562684 am: 7bb2eff8cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442217

Change-Id: I145528161bd80c6aacd0ba63165aec47c3b1a15e
2021-05-06 11:15:38 +00:00
Menghan Li
fe33a799f6 Merge "Fix Sound Amplifier does not have 'Open XXX' button" into sc-dev am: fa0ef8f2d9 am: a65e9a7ec5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409965

Change-Id: I3269b736731381acf6516381d882f7c4d92da986
2021-05-06 11:15:34 +00:00
Menghan Li
800c75fadc Merge "Rename Tap assistance to Timing controls" into sc-dev am: 51fa8a290b am: 88df66be69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441407

Change-Id: Ied40750e486e69f48577e971e9926070206b6ed6
2021-05-06 11:15:26 +00:00
changbetty
e4cd381d3c Change Network detail string form TYPE to Type
Screenshot: https://photos.app.goo.gl/k9xSS3f7LcDQih6u9

Bug: 187252277
Test: manual test
Change-Id: Ia17a01c77880d62b65b25d4f85c75d963591fa4c
2021-05-06 19:09:10 +08:00
TreeHugger Robot
7bb2eff8cc Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev am: bbb6562684
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442217

Change-Id: I6fc04fd9fe429c9d078d5bf974b5d907362d57e0
2021-05-06 11:09:05 +00:00
TreeHugger Robot
bbb6562684 Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev 2021-05-06 11:04:31 +00:00
Menghan Li
a65e9a7ec5 Merge "Fix Sound Amplifier does not have 'Open XXX' button" into sc-dev am: fa0ef8f2d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409965

Change-Id: I189c69439052ca5051caabf2f67387d55867701b
2021-05-06 11:01:27 +00:00
Menghan Li
88df66be69 Merge "Rename Tap assistance to Timing controls" into sc-dev am: 51fa8a290b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441407

Change-Id: Ie962bf922be7909538836c7dc78e7202f3126ed3
2021-05-06 11:01:23 +00:00
Menghan Li
fa0ef8f2d9 Merge "Fix Sound Amplifier does not have 'Open XXX' button" into sc-dev 2021-05-06 10:48:19 +00:00
Menghan Li
51fa8a290b Merge "Rename Tap assistance to Timing controls" into sc-dev 2021-05-06 10:43:54 +00:00
Jason Chiu
f43f2f80a7 Apply the new search bar background color
Fixes: 182092326
Test: visual, robotest
Change-Id: I95bd73323e8407716261367461f008bafa35e78b
2021-05-06 17:35:40 +08:00
Mill Chen
872db9c41a Add require scrolling button for FingerprintEnrolling intro
The consent in the fingerprint introduction has been updated. Users are
required to read through the content. Adding a scrolling button is to
prevent directly going to next page from this page. It also makes sure
the content has to be scrolled down to the bottom of page.

Fix: 184591438
Test: visual verified
1) Prepare a device with fingerprint sensor
2) Settings > Security > Fingerprint unlock
3) Entering the enrollment flow and see if the introduction has a button
named "More" on the right-bottom side.

Change-Id: I1916293807ca9fb04f5d576cf4f6aaccbbe1ff00
2021-05-06 17:29:38 +08:00
menghanli
924506e131 Fix Sound Amplifier does not have 'Open XXX' button
SettingsMainSwitchPreference does not allow hide switch bar. For support
this launch preference, we hide the SettingsMainSwitchPreference and add
new preference into the list.

Bug: 184711985
Test: Manual testing
Change-Id: I293800e83aafb387e0bb0a4988af774b56f508e6
2021-05-06 17:01:39 +08:00
Les Lee
696d0ded3d [automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: 7469890c87 am: f38761e027 am: eb9ec7f664 -s ours am: 956fdad9c6 -s ours am: cf4980bcc4 -s ours
am skip reason: Merged-In Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb with SHA-1 26128e8722 is already in history

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

Change-Id: Icf3864daa2fa256cf396ee7f9e3b8dbe6b64dcf5
2021-05-06 08:40:53 +00:00
TreeHugger Robot
5e3232cc63 Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev am: e6b78a5ada am: 6d44c61935
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319866

Change-Id: I9bba8b4a88e7916862936af624d0e4f81a2612a9
2021-05-06 08:40:30 +00:00
Les Lee
cf4980bcc4 [automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: 7469890c87 am: f38761e027 am: eb9ec7f664 -s ours am: 956fdad9c6 -s ours
am skip reason: Merged-In Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb with SHA-1 26128e8722 is already in history

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

Change-Id: I4c1479e199cdcf1f1bc5db6a5248a868fec1fdee
2021-05-06 08:27:42 +00:00
TreeHugger Robot
6d44c61935 Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev am: e6b78a5ada
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319866

Change-Id: Ie3838f6a81f4274886986d2f33070a7e91f94207
2021-05-06 08:27:30 +00:00
menghanli
dd452cdf08 Rename Tap assistance to Timing controls
The "Tap assistance" section in a11y settings is specifically about the duration or delay of time-based controls. Rename the title to align to a wording that better calls that out.

Bug: 186773417
Test: Manual testing
Change-Id: I1116f42468ea2d2d9210f6e34041c02831879dc9
2021-05-06 08:20:38 +00:00
Les Lee
956fdad9c6 [automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: 7469890c87 am: f38761e027 am: eb9ec7f664 -s ours
am skip reason: Merged-In Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb with SHA-1 26128e8722 is already in history

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

Change-Id: I46bc1bafa7153a6fdfeec1bdf2372f84ff3b35c7
2021-05-06 08:10:35 +00:00
TreeHugger Robot
0f49602b97 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fdcf96ee99 -s ours am: 2c8ed65745 -s ours am: 461b72cdc7 -s ours am: fd730ef2de -s ours
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 649bed1524 is already in history

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

Change-Id: Id29df1bf7e153469deb9d03facf2881c3fc89acf
2021-05-06 08:09:59 +00:00
TreeHugger Robot
7e80ecd04c [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fd32dc93c9 -s ours am: 2c30777afa -s ours am: 4ec5a7dbbb -s ours
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968 is already in history

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

Change-Id: I8e23b336d41e551a4280e53aed28005b800a93e8
2021-05-06 08:09:27 +00:00
TreeHugger Robot
e6b78a5ada Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev 2021-05-06 07:58:25 +00:00
TreeHugger Robot
fd730ef2de [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fdcf96ee99 -s ours am: 2c8ed65745 -s ours am: 461b72cdc7 -s ours
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 649bed1524 is already in history

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

Change-Id: I563dfd56f61ff24b1e805a41b5f1c620a091697e
2021-05-06 07:31:27 +00:00
Les Lee
eb9ec7f664 Merge "wifi: Use new API for wifi data usage function" am: 7469890c87 am: f38761e027
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759

Change-Id: I40404277f44a14d60654911e168a482794355971
2021-05-06 07:30:41 +00:00
TreeHugger Robot
4ec5a7dbbb [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fd32dc93c9 -s ours am: 2c30777afa -s ours
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968 is already in history

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

Change-Id: I3f867870e7206a38b91d17bc9b27776fd1602a92
2021-05-06 07:30:35 +00:00
Yi Jiang
1f2288ca74 Merge "Fixes NPE in Screen attention setting" into sc-dev am: d0af03e11c am: 9760064c72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443109

Change-Id: Ia60b673a7ddbdb2e4829cebc4920de34b7429d2e
2021-05-06 07:22:57 +00:00
TreeHugger Robot
461b72cdc7 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fdcf96ee99 -s ours am: 2c8ed65745 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If9595e9becec89031b14a641432585a5180c9e2e
2021-05-06 07:22:51 +00:00
TreeHugger Robot
7bb935fc56 Merge "Fix color filling on some Wifi pages" into sc-dev am: b720318fd3 am: 5fa9ab1487
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439324

Change-Id: I12d6993ae04623ed156eb480b3cf46afcf3c670e
2021-05-06 07:22:44 +00:00
TreeHugger Robot
79763c378b Merge "Fix loading ring overlapping problem" into sc-dev am: dff47cf00a am: 6cb46f5164
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439454

Change-Id: I414d2a14c0ba3576976f567dc97c3b11806f99ee
2021-05-06 07:22:26 +00:00
TreeHugger Robot
2c30777afa [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fd32dc93c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If1bb853639cb83accad5abb75d81eb66aa24a2b0
2021-05-06 07:14:24 +00:00
Les Lee
f38761e027 Merge "wifi: Use new API for wifi data usage function" am: 7469890c87
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759

Change-Id: Id4c98842b11cb4102059fdbbe76d5c4b527302fe
2021-05-06 07:14:01 +00:00
Yi Jiang
9760064c72 Merge "Fixes NPE in Screen attention setting" into sc-dev am: d0af03e11c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443109

Change-Id: I13a74b84567195bdeca5c3be7bc4dfda5619ecec
2021-05-06 07:08:42 +00:00
TreeHugger Robot
5fa9ab1487 Merge "Fix color filling on some Wifi pages" into sc-dev am: b720318fd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439324

Change-Id: I4e5a4e0f55d9eaefee6cc524e8ec0e580209cd5b
2021-05-06 07:08:36 +00:00
TreeHugger Robot
6cb46f5164 Merge "Fix loading ring overlapping problem" into sc-dev am: dff47cf00a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439454

Change-Id: I24baef74164db1aad5c7fbb5c48916ed253b2b1e
2021-05-06 07:07:53 +00:00
TreeHugger Robot
2c8ed65745 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fdcf96ee99 -s ours
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968 is already in history

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

Change-Id: I1f266c1eaf5463e5970008dc027ded775be88a97
2021-05-06 07:06:57 +00:00
Les Lee
7469890c87 Merge "wifi: Use new API for wifi data usage function" 2021-05-06 06:57:03 +00:00
Yi Jiang
d0af03e11c Merge "Fixes NPE in Screen attention setting" into sc-dev 2021-05-06 06:55:33 +00:00
TreeHugger Robot
b720318fd3 Merge "Fix color filling on some Wifi pages" into sc-dev 2021-05-06 06:54:14 +00:00
TreeHugger Robot
fd32dc93c9 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968 is already in history

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

Change-Id: Ia72b0e0d3827762aed6b92b100d5979df3f130f0
2021-05-06 06:53:25 +00:00