Commit Graph

83626 Commits

Author SHA1 Message Date
TreeHugger Robot
da8b5250ac Merge "Fix searching condition for biometric settings" into sc-dev am: a75ba398fe am: 55be0e9053 am: c92abc116c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439453

Change-Id: I571b589725ce67a95c88e0188e91be11807988a5
2021-05-17 02:02:03 +00:00
Jason Hsu
150f5b8046 Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev am: 8caef2218c am: 7649fa90f7 am: f39be2afea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408669

Change-Id: I3eb63a3861875adaa74764b1c7142893acff8642
2021-05-17 02:01:56 +00:00
TreeHugger Robot
14f582518c Merge "Update Prevent Ringing summary when it turn off" into sc-dev am: 3aca460dfc am: 17877ef23e am: 400cca93b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442220

Change-Id: Idae60cf9ed442292c34e4f275bfb089f3d5519fd
2021-05-17 02:01:27 +00:00
Les Lee
30382edd13 Merge "wifi: Use new API for wifi data usage function" into sc-dev am: 0dc1ee01f8 am: a9ca9bec05 am: f7f80cbec2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419446

Change-Id: I65c8b92f376233bf1ae7baa47ba114d9079a7df5
2021-05-17 02:01:21 +00:00
TreeHugger Robot
ca2de74aa2 Merge "[Provider Model] Fix settings crash issue" into sc-dev am: f396c0af28 am: e6e27e32bb am: 6c1e450359
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439968

Change-Id: I0f5719c0263b616d98c27fc40e1dcbd776659377
2021-05-17 02:01:16 +00:00
Weng Su
9d39fe823c [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: b43f98b65c -s ours am: 2452d722e9 -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: I30a1b091e63d0c872c4b88019659a2eb286edb8a
2021-05-17 02:01:10 +00:00
Jeremy Goldman
0813cef811 Merge "Create unit test for the VpnInfoPreference" into sc-dev am: 0a6a6269e3 am: 8c07c41e73 am: 0f8711450b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436936

Change-Id: I045c2cfcd9be0a9d592d3a5f70a92ed0b7fb069d
2021-05-17 02:01:05 +00:00
Weng Su
38e0de32f0 [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: a2b6fa6d46 am: 312e7f028d -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: I36e1d815d573c52b78dc258fe5e1628c1b163749
2021-05-17 02:00:56 +00:00
TreeHugger Robot
0480994a5f Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev am: f9ebf6600f am: a5d73fdde8 am: d334d18b59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436937

Change-Id: I08b3d2f0b2f586af4f75f913b5fb1d0648ec62a9
2021-05-17 00:54:51 +00:00
TreeHugger Robot
5e93047ab1 Merge "Add placeholder summary" into sc-dev am: 5dbc9e8124 am: 644b7a7c11 am: d2a1068245
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441563

Change-Id: I08a9089db8ccec61ed456c5f8f5b7f7a8ee10cbd
2021-05-17 00:54:44 +00:00
TreeHugger Robot
1a23e76163 Merge "Apply dynamic color for Erase all data(factory reset screen" into sc-dev am: ea1d3228b7 am: 64d97239b6 am: 8e65bf1fb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438399

Change-Id: I6364fea33d142352b787a293b0fecbb1f7cc1b81
2021-05-17 00:54:38 +00:00
TreeHugger Robot
060c27ea2d Merge "Fix the different color between status bar and action bar" into sc-dev am: 660341876d am: 69f08ccadf am: 87fd902250
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439316

Change-Id: I7ca8496059bb3222aa42c11693dd3c3cc64e81da
2021-05-17 00:54:32 +00:00
Betty Chang
3c703187f7 Merge "Fix a NPE when forget wifi network" into sc-dev am: 407e6650bc am: cacc766087 am: fd01c94e11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424448

Change-Id: I989362e2fd99948678d8be5dabdff8e2b9e81bb4
2021-05-17 00:54:27 +00:00
Betty Chang
8711b5ad2b Merge "Add scrollView with config layout and button layout" into sc-dev am: 1637f3cd26 am: 8103e62f57 am: e24630db50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438397

Change-Id: I430a308d3304950827b75078bef9167a64e03061
2021-05-17 00:54:22 +00:00
Menghan Li
ad7e170bb6 Merge "Fix broken tests on Accessibility package" into sc-dev am: ad3dd1abbc am: 058ea1317c am: 67d6749c16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436939

Change-Id: I6c593afc589c055b3959e367ac981e457048dab7
2021-05-17 00:54:16 +00:00
TreeHugger Robot
433ba733bc Merge "Fix borken test on Bluetooth and connected package" into sc-dev am: 5fe34bf7b5 am: 13b13b3469 am: 2f39050c66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436938

Change-Id: I79e94dafe5bb831360e6d126d8bc9456b8c8c065
2021-05-17 00:54:11 +00:00
Yanting Yang
bcc7f46ac7 [automerger skipped] Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" into sc-dev am: cd60664cc3 am: 9cf34b18b5 am: d89bc5c2ec -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: Ia0984ea137c3862d0ce7d15a8101bed2619836e3
2021-05-17 00:54:06 +00:00
Stanley Wang
63df0fa106 Merge "Fix the "Video call" can be searched on unsupported device." into sc-dev am: 2248941d43 am: afea6e4c5e am: 07148777f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424445

Change-Id: I27ed7b4b5677f7db5eee9eed285fa8bd47dfbd65
2021-05-17 00:53:59 +00:00
Alex Salo
42c7061e63 Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev am: c26fabff2a am: 1a1a77572c am: 20cc79cb28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14162986

Change-Id: I8e76cd1d4ebf3c9d5d187a12a081f6b70ae94938
2021-05-17 00:53:54 +00:00
Stanley Wang
a47954e804 Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev am: 9abe5df134 am: addda4b71c am: be0628458b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160600

Change-Id: Id471a215b70adebc69ec5e411e30418df0d6c00b
2021-05-17 00:53:44 +00:00
Arc Wang
f6b01338be Merge "Cleanup Storage Settings" into sc-dev am: 3576b10330 am: e22843f6ea am: 0e7e1f7e08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408668

Change-Id: I82fadc768026b0f077fed92317a9a1c0dc5c9cd9
2021-05-16 15:43:59 +00:00
Jeremy Goldman
0c40e24f51 Merge "Set summary if VPN is AlwaysOn Type" into sc-dev am: da602e196e am: 132a00da76 am: b1570edfb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424438

Change-Id: Ibf155a3cd790622f5d68045de7d87134d5c3a124
2021-05-16 15:43:51 +00:00
TreeHugger Robot
4dfd99ffe1 Merge "Fix back navigation in biometric enrollment." into sc-dev am: 619321198c am: 048c7bc414 am: b80efae71c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14427973

Change-Id: I580d9daf101093905e9db2011a7bd42ace37ec39
2021-05-16 15:43:46 +00:00
Kevin Chyn
079f33f0ed Merge changes from topic "credential-removal-strings" into sc-dev am: 177d76986a am: 84ed4f464b am: 5dcb3ddada
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14365935

Change-Id: Ib9e80f24012c3c4bfc986fddbed352fd85b71156
2021-05-16 15:43:26 +00:00
Kevin Chyn
bfb543bb17 Update credential removal strings am: a435a5a288 am: 611ba57c24 am: 4fd518ce10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14357317

Change-Id: Ia5571c4cb7af5733c8eec8ca379ab66cecd0c0a4
2021-05-16 15:43:25 +00:00
Amit Mahajan
246c291d82 Merge "Get rid of redundant mSubId." into sc-dev am: e2de71a6a4 am: a2a7d3f43c am: 77f50475bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14354534

Change-Id: Icbdcf06832079d231737fbdd7d0c6b5dc15e685b
2021-05-16 15:43:16 +00:00
Yi Jiang
dba9d6e0b0 Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: f164cb1976 am: 905739a64a am: a3cf23855d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14418428

Change-Id: Icacc2f723b29ac16f3f45eb144704497cebd714c
2021-05-16 15:43:11 +00:00
Wesley Wang
4f04cbe363 Merge "Update battery help message layout" into sc-dev am: 0df7148f1e am: 821b7f350d am: 09a1d75d36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424446

Change-Id: I689e08a054ce62ce9c6e95b8f8ba53c5fc2b2eb7
2021-05-16 15:43:05 +00:00
Trevor Black
3578b17ec6 Merge "Update Android Settings for the latest Extra App Info design" into sc-dev am: b6f2f39d27 am: 80938e8cbf am: f01cfa2977
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327037

Change-Id: I01b18a5f903110ea4438f9e75e628767dab59ba2
2021-05-16 15:42:53 +00:00
TreeHugger Robot
6477d8ffdf Merge "Add null check for app labels" into sc-dev am: cc28a0826e am: d1bd4abb65 am: e3f2bf6a01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14426523

Change-Id: I00a9691590d2dc387c87dc0b656a41b738439c87
2021-05-16 15:42:46 +00:00
Jan Tomljanovic
75879c2a4c Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev am: b6cea338a0 am: 6a9f5af516 am: f58d3e2766
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339810

Change-Id: I1725bb0f414cb9097cf0c0ffa32937ff875bb62e
2021-05-16 15:42:41 +00:00
Sally Yuen
c38b9ad677 Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev am: 478b218230 am: f2289dff47 am: bec8248367
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414318

Change-Id: I87806fdd9eb2143d639891d93c9a8d9d6eebf21b
2021-05-16 15:42:35 +00:00
TreeHugger Robot
5dbdd622ba Merge "Update app usage page footer string" into sc-dev am: 16f8b4c943 am: 1c108d1e86 am: 5a9fd7ff53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424447

Change-Id: Iaae75ed6c6f129e31bb99707e2ba19fd7b67e057
2021-05-16 15:42:30 +00:00
Betty Chang
d5505c54f9 Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev am: 35e244754c am: f9842053b1 am: 3034d700b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419452

Change-Id: Ie34bb59c0c470b1f3115c6a6b6f60f073bc58950
2021-05-16 15:42:24 +00:00
TreeHugger Robot
6c3ac42164 Merge "Remove the Summary of Backup in System Settings" into sc-dev am: 31a697eb79 am: f7f0865e76 am: 2b52b6d23e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410004

Change-Id: If876b9edd45378f2873bae5d57d0c69839440092
2021-05-16 15:42:19 +00:00
Jeremy Goldman
a9eb2c5b21 Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev am: d6913243a1 am: c52bd6574e am: d9d79acc43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409956

Change-Id: I49fcada558608ec551cc839e091848d84efe4544
2021-05-16 15:42:13 +00:00
Menghan Li
208026afbe Merge "[Material Next] Typography for font style" into sc-dev am: 4ec4cf32f1 am: 4eefcd6728 am: 940ea52cc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409968

Change-Id: I8b683dbe15cd03fa6705294526b6d8cf5a72ac05
2021-05-16 15:42:08 +00:00
YUKAI HUNG
6174a34b18 Merge "Rename variables and refine the format style from ag/14346184" into sc-dev am: 37d6d0835c am: af4a25c10d am: 12e3c6ea6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419441

Change-Id: Id86a0a770f7c2ee2b0f8974aeb57fd94026316ef
2021-05-16 15:42:01 +00:00
Bill Yi
1e1c42b750 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe0e09fdb4 -s ours am: d92ec7a9cc -s ours am: 7c02bd8602 -s ours am: a96b7f1b47 -s ours am: f7193a1372 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idc7edc9d366dd0470d97dba42d795f74065bd020
2021-05-16 15:41:56 +00:00
Bill Yi
c8717a1282 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73e6bf08d -s ours am: d7caf65594 -s ours am: 925a76780a -s ours am: 3211cdab00 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3be3c66e2c9b4fcf02084536f2e8a4c617913fcf
2021-05-16 15:41:52 +00:00
TreeHugger Robot
2dceaa0d82 Merge "Fix unable to send file via OPP" into sc-dev am: 5ef4fa037e am: 05c45b3d92 am: 66d9be4c39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327016

Change-Id: Id585e0c7743b33c880e3bc7768a0525d29198093
2021-05-16 15:41:47 +00:00
TreeHugger Robot
86678475b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8d0376c98c -s ours am: 55c94745be -s ours am: c420aaa025 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f8177111db67e4765392ff089d80f41552e9617
2021-05-16 15:41:28 +00:00
TreeHugger Robot
4892c6f58e Merge "Remove Advanced item in Language & input Settings." into sc-dev am: f2ec0fbf83 am: c91fbcefad am: a8f18c44a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410006

Change-Id: I19a1cda3ad94a6b8245bedd1a655fb6ef2596b67
2021-05-16 15:41:23 +00:00
Kevin Chyn
83feeac784 Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev am: 08b7833120 am: 97ebb9431d am: dce9141d20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414017

Change-Id: Ie47384fbf531586b62cd6038449055bb1f6ff8d1
2021-05-16 15:41:17 +00:00
bsears
e8ee582a51 Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev am: deb2acc9b3 am: 6e1d3aa80d am: c87bdd10db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410366

Change-Id: Ic2cfa60f895bb07413bc0061bd26fe08ac05875b
2021-05-16 15:41:08 +00:00
Dmitri Plotnikov
450f498dea Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2 am: e8694a9805 am: 5486742d6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184

Change-Id: I37093f8519df7fcc2c20c0eda3e7933f3070e189
2021-05-16 13:08:57 +00:00
TreeHugger Robot
f5ac6591b9 Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 8d1fd73e89 am: 6885fa717e am: 318f637086
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186629

Change-Id: Ibcdf3e865c5275799251811b92fc1f0528a07d2c
2021-05-16 13:05:51 +00:00
TreeHugger Robot
d9121556f3 Merge "Update apps icon in Sound > Media page to correct size." into sc-dev am: 80daf4fc49 am: 19fb79491f am: 9a5030b795
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410003

Change-Id: I57dd17160de313c561f5a0dd1a98678cba48ecff
2021-05-16 13:05:40 +00:00
Yichi Chen
924cebbf62 Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev am: ffbea30a18 am: d54f8c82a8 am: 5a2a17fe2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352150

Change-Id: Ibdd48af00e07a96e80f00fb2e12e84da18648f42
2021-05-16 13:05:31 +00:00
TreeHugger Robot
4368d3ae7d Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev am: 001dcc9e93 am: 41118f5575 am: f6e1d83d60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409961

Change-Id: Ia2f55afb265526dfbb408386fa3a194c149d4911
2021-05-16 13:05:24 +00:00