Yanting Yang
f93d748e39
Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216
Change-Id: Ia37803139c26349cfc0df75badd5a907c0735c26
2021-05-07 09:14:23 +00:00
Yanting Yang
c37abc9edb
Merge "Add summary back to the homepage" into sc-dev
2021-05-07 09:00:32 +00:00
Syaoran Kuo
4ec71237bb
Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410
Change-Id: Idde9165abeb18ab8e348c0041ed2dce3db126b9f
2021-05-07 08:28:14 +00:00
Syaoran Kuo
7dd05a8c05
Merge "Remove wifi related test." into sc-dev
2021-05-07 07:54:25 +00:00
Syaoran Kuo
bc1e5321ab
Remove wifi related test.
...
To add these case back, add a success case to avoid empty test error.
Bug: 186372528
Test: atest SettingsComponentTest
Change-Id: I6d973a244338f67e3d35e9657d1d46eba8ba4501
2021-05-07 13:44:08 +08:00
TreeHugger Robot
072d0b9a2d
Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975
Change-Id: Ibc4ec9f604d045450f14d5cea8e5d11f9f4d334e
2021-05-07 05:11:44 +00:00
TreeHugger Robot
db624992ed
Merge "Wallet/controls - Migrate existing settings" into sc-dev
2021-05-07 05:05:34 +00:00
Edgar Wang
bee5f45d12
Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: I0bd42f5e5dacb6e366af1f73f1b06d72abdf994e
2021-05-07 05:04:06 +00:00
Edgar Wang
febe901c8e
Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: If3b1222631f8ed62b4499f6be5d3a4947a86f5cf
2021-05-07 04:49:18 +00:00
Edgar Wang
b4ada164a0
Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: I9e7e25716d18b62a38250d6b02c2794cc2046886
2021-05-07 04:32:55 +00:00
Edgar Wang
7106d10dd0
Merge "Add personal dictionary summary text" am: 0cbc974638
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: Ie7686e0df4f0e44bdb1dcb2d55a21e0c957d65b2
2021-05-07 04:18:17 +00:00
TreeHugger Robot
ff445f593b
Merge "Fix the battery usage screen left alignment issue" into sc-dev am: 8642ee35ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455997
Change-Id: I8b38a671a5cec88547b906f1ed625c01006a9b56
2021-05-07 04:13:23 +00:00
Treehugger Robot
583a92a34f
Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c am: 026ecdd388 am: e24cba9b59
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923
Change-Id: I0848ff33d5273fe386bc83ece390004c7afcccc1
2021-05-07 04:12:43 +00:00
Edgar Wang
0cbc974638
Merge "Add personal dictionary summary text"
2021-05-07 04:02:00 +00:00
TreeHugger Robot
8642ee35ad
Merge "Fix the battery usage screen left alignment issue" into sc-dev
2021-05-07 03:59:13 +00:00
Treehugger Robot
e24cba9b59
Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c am: 026ecdd388
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923
Change-Id: If7854bb03db1b001bb6dfd35f28f074a66b77abe
2021-05-07 03:39:34 +00:00
Treehugger Robot
026ecdd388
Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923
Change-Id: I8aa67688d4c88a64c549e1094f3311ec4a4b2499
2021-05-07 03:11:46 +00:00
TreeHugger Robot
f738723370
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: Ib0bfc323ee5712ccd6dcdf382235188cddbdf5da
2021-05-07 03:10:57 +00:00
Betty Chang
08f06afcae
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: Ib43063a5566b3dcc8c11e1d973689099d597d85c
2021-05-07 03:10:48 +00:00
TreeHugger Robot
c0ae51025b
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: I749b72856d56f0cb1366ea2669775252ef78e974
2021-05-07 03:10:35 +00:00
TreeHugger Robot
b1b7029fa6
Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev
2021-05-07 02:58:16 +00:00
Treehugger Robot
27a27acb2c
Merge "Move myself to the emeritus section" am: 9119105da9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923
Change-Id: I5dc08c10017d0109271f68e86729bdabaa26262f
2021-05-07 02:53:45 +00:00
ykhung
3b6e225a5c
Fix the battery usage screen left alignment issue
...
Bug: 187383692
Test: make SettingsRoboTests
Change-Id: I9abb17562bea3727f31ce781cf452412a4ee7818
2021-05-07 10:48:28 +08: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
67739493d4
Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154
Change-Id: Ib1056680d62dd10e6708ae9aadf9ae949771f0c1
2021-05-07 00:12:31 +00:00
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
d0906f1299
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: I62b0f2677eda8c49436c569b1440358b06fe9e9c
2021-05-06 18:42:35 +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
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
3cb36a13f6
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: I9aea427880025ae0d83cb77244de38fa9dc11bc4
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
c1bb29bfd4
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: I59026cab3e3700cd861d75f989700fe36b931c99
2021-05-06 10:59:49 +00:00
Menghan Li
ebaeca294a
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: I00df4bc27bc268334ce8c77282304a5b2988aa10
2021-05-06 10:59:44 +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
985f5bb786
[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: Icf5d9caa7e08fdff8136d649cc8b69a4d2ab3bd6
2021-05-06 08:25:45 +00:00
TreeHugger Robot
1cc5ae6b94
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: I646327b872c5e618814dd4e00e9d5d3bcd840edc
2021-05-06 08:25:24 +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
7757c26e55
[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: I232677034128f4d2cb50e6eaeb079fa6176f6851
2021-05-06 07:29:00 +00:00