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
Yi-Ling Chuang
377410de6d
Merge existing bundle with ActivityOptions
...
Use Bundle.putAll() to take both the bundle passed in to the
startActivity(Intent, Bundle) and also the new created ActivityOptions
bundle, so no extra info will be lost.
Test: rebuild and add log to make sure all bundle info are kept
Bug: 187471344
Change-Id: I69c2978488f51f1c8ee705dc1bcd1bf17928fe33
2021-05-07 11:30:21 +08: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
2929cdd115
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: I34041ae1c70231864a1905d545ceea383db20c65
2021-05-07 03:10:45 +00:00
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
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
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
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
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
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
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
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
403473ef38
[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: I40a89a79db249f956fcb23b0cfded67e0e02b695
2021-05-06 08:25:42 +00:00
TreeHugger Robot
7e253d8c2b
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: I8deeac178e548cd1034122de5e6a2948292fc4d4
2021-05-06 08:24:16 +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
58b769c7d2
[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: Iec8bb7800609d6347d8ba8fddbdc9d1c456ac44c
2021-05-06 07:28:35 +00:00
TreeHugger Robot
fb3cf97a7f
[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: I6b5ba56627d1179359307c0c36caf4fac0920cc8
2021-05-06 07:28:05 +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
7c34fa7e73
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: I159284629ef20ef9faff7a6e6412d77daecbbb48
2021-05-06 07:07:47 +00:00
TreeHugger Robot
e180cdec63
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: I95dea0ef77b8262d5505e2167d73dae1d3ca79da
2021-05-06 07:07:27 +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
9e7e20704f
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: Idf7b10b0aa75cf50dc5a167404abbac64124fe53
2021-05-06 07:06:06 +00:00
Les Lee
7469890c87
Merge "wifi: Use new API for wifi data usage function"
2021-05-06 06:57:03 +00:00