Betty Chang
b61476a849
Merge "Change Network detail string form TYPE to Type" into sc-dev am: 19f21656a1
am: e7f72efe61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441413
Change-Id: Ib08ad5c4a7ebaa6005900510374430faff174761
2021-05-20 01:17:42 +00:00
TreeHugger Robot
037003d033
Merge "Adopt new battery history map with interpolation method" into sc-dev am: b7ffc45052
am: dce7f21a9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441406
Change-Id: Id23d5eca3761df81702123992b4cf41b838f2a4f
2021-05-20 01:17:37 +00:00
TreeHugger Robot
8b933ac05b
Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd
am: 57f25c2fe3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154
Change-Id: Ib060dc1513e40f196de00e347af184ecde5f0cf8
2021-05-20 01:17:31 +00:00
Julia Reynolds
37fd70f60c
Merge "Update the theme for Notification history page" into sc-dev am: 7d3c283e27
am: 7abbde1371
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442218
Change-Id: I76f6c71e42b54867847ee9fbbe9274d1f4bf8a0c
2021-05-20 01:17:26 +00:00
TreeHugger Robot
b959c76341
Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev am: bbb6562684
am: fedaee8113
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442217
Change-Id: Ia3e8cd4917b75169e4fefe4491987d74ea439ad7
2021-05-20 01:17:20 +00:00
Menghan Li
fc0fdda74e
Merge "Fix Sound Amplifier does not have 'Open XXX' button" into sc-dev am: fa0ef8f2d9
am: e080e67847
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409965
Change-Id: I3bfd48516085b752de192be74bdc921e280d6b66
2021-05-20 01:17:14 +00:00
Menghan Li
148dc9427c
Merge "Rename Tap assistance to Timing controls" into sc-dev am: 51fa8a290b
am: 9d50ac0ab0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441407
Change-Id: I75c9e18e07c8eaacdbd5d44617275db4b5f58c0f
2021-05-20 01:17:09 +00:00
Les Lee
63eaedcce4
[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: 403473ef38
-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: Idc2ae5ff18518e7dd588423d1d581f295a4bfbb8
2021-05-20 01:17:03 +00:00
TreeHugger Robot
b2f7505182
Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev am: e6b78a5ada
am: 7e253d8c2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319866
Change-Id: I26646287e8b3e8153c680e2b67fd9ded6683e2d8
2021-05-20 01:16:56 +00:00
TreeHugger Robot
a2036a2bb6
[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: 58b769c7d2
-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: I5df0cfb74506c93aadae1b225312c39d47c50dfb
2021-05-20 01:16:51 +00:00
TreeHugger Robot
6a2fb46c60
[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: fb3cf97a7f
-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: I92fbd70667852532cc1ba15cdbbc962453f85528
2021-05-20 01:16:46 +00:00
Yi Jiang
c5503e55c5
Merge "Fixes NPE in Screen attention setting" into sc-dev am: d0af03e11c
am: 7c34fa7e73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443109
Change-Id: Iaea3f01e542c3d2b17f013ba3028dd3de7a8b287
2021-05-20 01:16:40 +00:00
TreeHugger Robot
865b230d7e
Merge "Fix color filling on some Wifi pages" into sc-dev am: b720318fd3
am: e180cdec63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439324
Change-Id: I0b356fb4ff87059a7134f6cd0930c6130da21984
2021-05-20 01:16:35 +00:00
TreeHugger Robot
e8ed39ebfe
Merge "Fix loading ring overlapping problem" into sc-dev am: dff47cf00a
am: 9e7e20704f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439454
Change-Id: Iade703825e071e46359256bb7bb8e79177df402e
2021-05-20 01:16:30 +00:00
TreeHugger Robot
550a6202d5
Merge "Update battery settings string" into sc-dev am: 1ae9a706ff
am: 0887761e6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439450
Change-Id: I60ddba043cc7bf96901d1bee69857b0cc86bdaa9
2021-05-20 01:16:24 +00:00
YUKAI HUNG
91e0e66fdd
Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev am: b3267fb2ea
am: 7452491629
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439969
Change-Id: I0679dc13ebe26698e8b2b086d622d1abda92d16f
2021-05-20 01:16:18 +00:00
TreeHugger Robot
f394946e57
Merge "Fix searching condition for biometric settings" into sc-dev am: a75ba398fe
am: 1f00925c74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439453
Change-Id: I68997e13accac1583a4d9ff447bea11943996d6a
2021-05-20 01:16:12 +00:00
Jason Hsu
c1b8e99c24
Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev am: 8caef2218c
am: 1b23d619b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408669
Change-Id: Iff6fd6fd9859209550d85eef21439c72c03ae9ce
2021-05-20 01:16:07 +00:00
TreeHugger Robot
bb4f8483bd
Merge "Update Prevent Ringing summary when it turn off" into sc-dev am: 3aca460dfc
am: cb07496c14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442220
Change-Id: I3b68a6bd6ed5f5cfc7acfc23d9b2e27b33b89b32
2021-05-20 01:16:01 +00:00
Les Lee
93dc161479
Merge "wifi: Use new API for wifi data usage function" into sc-dev am: 0dc1ee01f8
am: ab3528dc86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419446
Change-Id: Ibc1438d794fd2dc062b8bf99bd33def6c74abf29
2021-05-20 01:15:56 +00:00
TreeHugger Robot
afc4f48897
Merge "[Provider Model] Fix settings crash issue" into sc-dev am: f396c0af28
am: a59fe14784
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439968
Change-Id: I8e956a04f12d5724cc6d8a23756813c56f954fd5
2021-05-20 01:15:50 +00:00
Weng Su
1ee225f32c
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-s ours am: 41b7d11496
am: 2e9640d5b0
am: e304f37927
-s ours am: 2f3389ff0c
-s ours am: d2c87251c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: Ic2f981fdd5b31411119b3333908da7dffe0303f6
2021-05-20 01:15:44 +00:00
Jeremy Goldman
609d730132
Merge "Create unit test for the VpnInfoPreference" into sc-dev am: 0a6a6269e3
am: 3266345a56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436936
Change-Id: I28c58f3fe29d4e38f3694ceb75d18e23229a53b2
2021-05-20 01:15:38 +00:00
Weng Su
bac6724ebd
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-s ours am: 41b7d11496
am: 7a8de548ce
-s ours am: 6e761235fd
am: b4e67f049b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: I66d6b5083c9fdc2fa9d9da3309cd4a4db045745c
2021-05-20 01:15:33 +00:00
TreeHugger Robot
e9f84d4954
Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev am: f9ebf6600f
am: 7024c27f8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436937
Change-Id: Iaac021e3b30afcc6806b3378f7865ba82ebcedd6
2021-05-20 01:15:28 +00:00
TreeHugger Robot
9ea3d521d0
Merge "Add placeholder summary" into sc-dev am: 5dbc9e8124
am: 712a9f3c38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441563
Change-Id: I2b1df7c5878adf189eb788090f75b89bbc0c194d
2021-05-20 01:15:22 +00:00
TreeHugger Robot
885dd63655
Merge "Apply dynamic color for Erase all data(factory reset screen" into sc-dev am: ea1d3228b7
am: d5d3c7c768
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438399
Change-Id: Iff85b9585083774e7c08d6bfafeb6a975941858e
2021-05-20 01:15:17 +00:00
TreeHugger Robot
ed38b6231a
Merge "Fix the different color between status bar and action bar" into sc-dev am: 660341876d
am: 1ccf7b5975
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439316
Change-Id: I050aa7af94f957761c1b9be0b9809e5d5386e129
2021-05-20 01:15:11 +00:00
Betty Chang
6ff88f0c39
Merge "Fix a NPE when forget wifi network" into sc-dev am: 407e6650bc
am: 23c1ad4123
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424448
Change-Id: I7fd9c8762f7e31bae8c98dc7e8ae78ba3afd1c84
2021-05-20 01:15:06 +00:00
Betty Chang
db08ca0830
Merge "Add scrollView with config layout and button layout" into sc-dev am: 1637f3cd26
am: 58318ccb5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438397
Change-Id: I8d91e3de6d1ad1d1cef5fa17f579194f8058dcf5
2021-05-20 01:11:30 +00:00
Menghan Li
2fbcc8a1cd
Merge "Fix broken tests on Accessibility package" into sc-dev am: ad3dd1abbc
am: 1aa7f9c3ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436939
Change-Id: I814d1da68060a0019062b26295514e95e3e4729b
2021-05-20 01:11:25 +00:00
TreeHugger Robot
df1d288b83
Merge "Fix borken test on Bluetooth and connected package" into sc-dev am: 5fe34bf7b5
am: b0218592e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436938
Change-Id: Ib2fe8a95101768d61b3b28d5bdda885e32276046
2021-05-20 01:11:19 +00:00
Yanting Yang
a886b37991
[automerger skipped] Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" into sc-dev am: cd60664cc3
am: 9b448ebdb9
-s ours
...
am skip reason: Merged-In Ia22ebac4baec60f72b8516e9e79998cd788266ab with SHA-1 8e712c1501
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410005
Change-Id: I1d0b5d6c1d44e469fbd5579d3e07f94c559f6ef5
2021-05-20 01:11:14 +00:00
Stanley Wang
584f09fb55
Merge "Fix the "Video call" can be searched on unsupported device." into sc-dev am: 2248941d43
am: c517e4535b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424445
Change-Id: I497c768eb637b6795f5a9931985659b5634b4bde
2021-05-20 01:11:08 +00:00
Alex Salo
8b1e82f69b
Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev am: c26fabff2a
am: aabbf2e0ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14162986
Change-Id: Ic32bdfe6b6f4c3ba9f801d24031511551f8d8617
2021-05-20 01:11:02 +00:00
Stanley Wang
237f77840e
Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev am: 9abe5df134
am: f41ba6124a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160600
Change-Id: Ifb09c19c2f682425f179e7779639ebb24b1ca56b
2021-05-20 01:10:57 +00:00
Arc Wang
7e252a4021
Merge "Cleanup Storage Settings" into sc-dev am: 3576b10330
am: a298a39a2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408668
Change-Id: I35d3101d816f30d4443f3147853ab64be155d1e4
2021-05-20 01:10:51 +00:00
Jeremy Goldman
f9cb40eba5
Merge "Set summary if VPN is AlwaysOn Type" into sc-dev am: da602e196e
am: 03b2d99ba3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424438
Change-Id: Ie0fa8e48c0a113f073ded7e6d298684d9caacd71
2021-05-20 01:10:46 +00:00
TreeHugger Robot
0f312601fb
Merge "Fix back navigation in biometric enrollment." into sc-dev am: 619321198c
am: 298f774060
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14427973
Change-Id: Iea6da855a74498ea4690586239126d7854e6d986
2021-05-20 01:10:41 +00:00
Kevin Chyn
9e7a27f2bf
Merge changes from topic "credential-removal-strings" into sc-dev am: 177d76986a
am: 4431af41b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14365935
Change-Id: Ia5e3163644c71b032c202a48bb7d8aeb72783899
2021-05-20 01:10:35 +00:00
Kevin Chyn
78a3668420
Update credential removal strings am: a435a5a288
am: 39f85272a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14357317
Change-Id: I55b618c8d42093c6b5845f7011faf8d48eaa4851
2021-05-20 01:10:29 +00:00
Amit Mahajan
47f60c06ce
Merge "Get rid of redundant mSubId." into sc-dev am: e2de71a6a4
am: 433ecf9a5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14354534
Change-Id: I6f1f054ac65e7ea04ee6a435aa8b56e16adb791a
2021-05-20 01:10:24 +00:00
Yi Jiang
9fb96d69c7
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: f164cb1976
am: 3179d1e1ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14418428
Change-Id: Ic6712170b4825caae5920cbf2caf7c74a533ff49
2021-05-20 01:10:19 +00:00
Wesley Wang
7c75a501d0
Merge "Update battery help message layout" into sc-dev am: 0df7148f1e
am: 60983ec7ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424446
Change-Id: I85d38982caf40dd5a7d975e77f58255a21557c09
2021-05-20 01:10:13 +00:00
Trevor Black
3750ebd446
Merge "Update Android Settings for the latest Extra App Info design" into sc-dev am: b6f2f39d27
am: 933819c4eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327037
Change-Id: I37196fb47d5dd5d22fb7e12096ab0372f62f0298
2021-05-20 01:03:12 +00:00
Arc Wang
4a2acd2e20
Fix UnsupportedOperationException in Display Settings
...
Remove android:textColorHint from Theme.Settings to fix the regression.
This is a quick fix, each EditText should set its hintTextColor
attribute before there is a fix to apply the attribute globally in
Settings APP.
Bug: 188405076
Test: manually launch 'Font size' and 'Display size'.
Change-Id: If3313be47e0c3e8ce9d41a6e87cdf2e7067ce54b
2021-05-20 01:01:21 +00:00
Colin Cross
e503f316a3
Merge "Update style name"
2021-05-20 00:48:34 +00:00
TreeHugger Robot
5ea5b74764
Merge "Add null check for app labels" into sc-dev am: cc28a0826e
am: d03c199819
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14426523
Change-Id: Ia93d6383e836002daa3a7a0cc9f3103ab178cb65
2021-05-20 00:45:51 +00:00
Wesley.CW Wang
fb6500410f
Update style name
...
Bug: 187923403
Test: make SettingsRoboTests
Change-Id: I01455cef919cb8692df9d275c8dff0c68d75861f
(cherry picked from commit 2b6a081a0b
)
2021-05-19 17:43:34 -07:00
Jan Tomljanovic
b242934da5
Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev am: b6cea338a0
am: e509a694c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339810
Change-Id: I3c49a39461d08d5272936504d5a63b6cd7389634
2021-05-19 23:44:52 +00:00