Commit Graph

82429 Commits

Author SHA1 Message Date
TreeHugger Robot
2ec9be2d6b Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev am: b1b7029fa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441409

Change-Id: I6fd5cc40bcbfed8ccb9f2c09f7a09d5d7f8b165e
2021-05-07 03:10:41 +00:00
Betty Chang
700b881701 Merge "Change Network detail string form TYPE to Type" into sc-dev am: 19f21656a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441413

Change-Id: I77b698e9f9cfdf6ae06ce2b659d47f793aa574de
2021-05-07 03:10:17 +00:00
TreeHugger Robot
139745d11b Merge "Adopt new battery history map with interpolation method" into sc-dev am: b7ffc45052
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441406

Change-Id: I32b338b48aceb00536b208421ac17a802e81adbf
2021-05-07 03:10:10 +00:00
TreeHugger Robot
b1b7029fa6 Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev 2021-05-07 02:58:16 +00:00
Betty Chang
19f21656a1 Merge "Change Network detail string form TYPE to Type" into sc-dev 2021-05-07 02:29:35 +00:00
TreeHugger Robot
b7ffc45052 Merge "Adopt new battery history map with interpolation method" into sc-dev 2021-05-07 02:09:43 +00:00
TreeHugger Robot
380cb79ace Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154

Change-Id: I8413aa03a66772644b70efcfcf1985223249c57c
2021-05-07 00:12:29 +00:00
TreeHugger Robot
b3b59d6edd Merge "Refactor ChooseLockGenericController" into sc-dev 2021-05-06 23:59:17 +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
a546fdbdac 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: I12ceedfd2c4dfc1688d138c4c80a4ab1514a29d5
2021-05-06 18:43:05 +00: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
TreeHugger Robot
3f0da77e12 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: Ida5f36fe5a6dcf40ccf60b96e2c976c7970fd7db
2021-05-06 11:21:59 +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
bbb6562684 Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev 2021-05-06 11:04:31 +00:00
Menghan Li
4fee5fa9a9 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: I0ee9eccbff975e44b1ddffcb4509b297d1984b6c
2021-05-06 10:59:33 +00:00
Menghan Li
0a2486250f 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: Id487f29ac084180d043670053f05ff7f3844b028
2021-05-06 10:58:53 +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
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
04f6318d48 [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: I85378b6a0c822abd0cf41cfb59c4f46907a0d5cf
2021-05-06 08:26:04 +00:00
TreeHugger Robot
41830dddca 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: I368d9c09dce6e68d49f07dc83d4f11b42f7b37ba
2021-05-06 08:25:56 +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
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
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
30dc4804be [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: subject contains skip directive

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

Change-Id: I7bccb7a38bfd1fa36e851f9a032d6d5ed47a0cb4
2021-05-06 07:28:49 +00:00
TreeHugger Robot
16ea9daddd [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: subject contains skip directive

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

Change-Id: I8a51c1af3c2a01753ec9161ec157b0413e1d13da
2021-05-06 07:28:36 +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
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
1bfd8eda4f 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: I77106574c53b936d82030bc8cc027521c77af554
2021-05-06 07:06:59 +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
TreeHugger Robot
95b1b57aff 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: I0ac438a4a3fa145dbff54ffbe48c88b7db0d4c3f
2021-05-06 07:06:43 +00:00
TreeHugger Robot
50ace76f98 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: I85e251bc9aa9e42735abbe292ec7c596dfcd74b7
2021-05-06 07:05:54 +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
TreeHugger Robot
fdcf96ee99 [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: Ia495305891c49e3ffee19d7bee3f0107f6085ad3
2021-05-06 06:52:02 +00:00
TreeHugger Robot
dff47cf00a Merge "Fix loading ring overlapping problem" into sc-dev 2021-05-06 06:51:24 +00:00
Mill Chen
efbcc69cc4 Fix inconsist color filling on collapsing toolbar
Some pages are updating the background color for action bar after action
bar is created, which will break the animation of collapsing toolbar. It
also causes the different color filled in the status bar and collapsing
toolbar area separately. Removing the styleActionbar method from
EntityHeaderController can fix this issue.

Fix: 187019164
Test: robotests && visual verified
1) Settings -> Apps -> See all apps -> pick up either app -> Mobile data
& Wi-Fi
2) Scrolling the content and see if the toolbar has the different color
between status bar and toolbar

Change-Id: Ic0842b9e6c48662872694534a3696c4b8900481f
2021-05-06 14:46:30 +08:00
TreeHugger Robot
21ab21168b Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev 2021-05-06 06:30:13 +00:00
TreeHugger Robot
565fae6f4b Merge "Update battery settings string" into sc-dev am: 1ae9a706ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439450

Change-Id: Icf787d0d45c0f859843153f6a290e497c0fbb17c
2021-05-06 06:13:19 +00:00
YUKAI HUNG
dd98b47255 Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev am: b3267fb2ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439969

Change-Id: I2b6c5ee5c3ef4bdb50091f4d31ed84e0777afafc
2021-05-06 06:12:38 +00:00
TreeHugger Robot
1ae9a706ff Merge "Update battery settings string" into sc-dev 2021-05-06 05:55:49 +00:00
YUKAI HUNG
b3267fb2ea Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev 2021-05-06 05:54:00 +00:00
TreeHugger Robot
7ed90fe7db Merge "Fix searching condition for biometric settings" into sc-dev am: a75ba398fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439453

Change-Id: I21825cc582faf3320115c16579ee77de38ea018e
2021-05-06 05:50:25 +00:00
TreeHugger Robot
a75ba398fe Merge "Fix searching condition for biometric settings" into sc-dev 2021-05-06 05:37:08 +00:00