Betty Chang
e7f72efe61
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: I0078fa1a23e4534782b0e8013004974d0fce10a9
2021-05-07 03:10:24 +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
dce7f21a9d
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: I5c84839a83ab8c7e3699b2e79613eaf556f9003f
2021-05-07 03:09:22 +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
493da906c0
Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd am: fa9a904c1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154
Change-Id: I7cf8c7b1689d594473f2a31a011d368769a60e6a
2021-05-07 00:45:05 +00:00
TreeHugger Robot
fa9a904c1f
Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154
Change-Id: I6bce8daa7fcdc06417f0ad94c1a400255f20bf78
2021-05-07 00:14:04 +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
57f25c2fe3
Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154
Change-Id: Iaf50c89889b985c638211a9101fa9f8f664097ac
2021-05-07 00:12:02 +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
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
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
7abbde1371
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: I54f63a76ad81f9a87c562bf0937f8303d744d91d
2021-05-06 18:42:53 +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
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
TreeHugger Robot
fedaee8113
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: Id711f02a541d38cad1c3828d50e414ec23cf295a
2021-05-06 11:20:58 +00: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
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
e080e67847
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: I2c9001ab2907c43d34218625f06151eaa3279e92
2021-05-06 10:59:00 +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
9d50ac0ab0
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: I5a3c12704432a47a01045c6844c5d33c788d7490
2021-05-06 10:57:32 +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
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