Commit Graph

84522 Commits

Author SHA1 Message Date
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
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
Sally Yuen
9a313b52cb Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev am: 478b218230 am: b77b7385b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414318

Change-Id: Ifad9645509eceb365433f6fb91a8afda9beb7443
2021-05-19 21:59:26 +00:00
TreeHugger Robot
1ce65545d0 Merge "Update app usage page footer string" into sc-dev am: 16f8b4c943 am: bccec996c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424447

Change-Id: I1a29c0feaf45f87d4557b077c677ec4609ab4f49
2021-05-19 21:44:10 +00:00
Betty Chang
9bf920f223 Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev am: 35e244754c am: 26fcdf4745
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419452

Change-Id: Ic7d93eeda0273211401c7a86b6f2b5dca426a540
2021-05-19 21:11:44 +00:00
TreeHugger Robot
d5131e7aa9 Merge "Remove the Summary of Backup in System Settings" into sc-dev am: 31a697eb79 am: 722ac92514
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410004

Change-Id: Id7c5546a71616e6885233445b0ea875764c63509
2021-05-19 20:08:23 +00:00
Jeremy Goldman
ed7bbfed0a Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev am: d6913243a1 am: d41def87bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409956

Change-Id: I672e3cdd40d099b950d66e52b4781056f6c3379f
2021-05-19 19:09:08 +00:00
Menghan Li
784cbe08f1 Merge "[Material Next] Typography for font style" into sc-dev am: 4ec4cf32f1 am: f47694d4c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409968

Change-Id: I884d411b843d738370a9b8868bb7cd159a75d6e1
2021-05-19 17:32:47 +00:00
YUKAI HUNG
737e6d449d Merge "Rename variables and refine the format style from ag/14346184" into sc-dev am: 37d6d0835c am: ff80cd7dd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419441

Change-Id: I9a9310bc3face17fa2e94ee3b3a594361fb44846
2021-05-19 15:58:03 +00:00
Bill Yi
2f6785dfd6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe0e09fdb4 -s ours am: d92ec7a9cc -s ours am: 7c02bd8602 -s ours am: 3808659f80 -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: Ia0f604fc7ae560c1ac176331c0233204bbdd47c8
2021-05-19 15:25:17 +00:00
Bill Yi
c1ebacd82e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73e6bf08d -s ours am: d7caf65594 -s ours am: 383a5aa78e -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: I5ae1e2bd9ee1ce3998dae69bfe5555b22d9bb29f
2021-05-19 14:32:57 +00:00
TreeHugger Robot
8ae1bc7d9c Merge "Fix unable to send file via OPP" into sc-dev am: 5ef4fa037e am: 0151b0a8f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327016

Change-Id: I9fff2a7b451c40443b74165ec937c6240812adeb
2021-05-19 12:42:36 +00:00
TreeHugger Robot
09c04410cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8d0376c98c -s ours am: 0b99020b5a -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: Ief2ea4249c89a9cbf17a702576f0b9cfc30bea60
2021-05-19 11:19:57 +00:00
TreeHugger Robot
b6859223b0 Merge "Remove Advanced item in Language & input Settings." into sc-dev am: f2ec0fbf83 am: dbe3c72bb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410006

Change-Id: Ie5139f823f78bf147edb8770266c823be061dae3
2021-05-19 11:13:33 +00:00
Kevin Chyn
b3f9271fa9 Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev am: 08b7833120 am: c60fcecf32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414017

Change-Id: Ie3b5db627f3598ece2ac21cf8f9ab5c829109acc
2021-05-19 10:36:28 +00:00
bsears
f17a812842 Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev am: deb2acc9b3 am: 15b21dfed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410366

Change-Id: Ib3f4d3bad60cb72c1c6407e0bdfc1f4e01823a8b
2021-05-19 09:20:30 +00:00
Dmitri Plotnikov
6deeadc714 Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2 am: 6acbd70713 am: c2515e9c20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184

Change-Id: I8471bb1aff886e76277cd90bb5230776dc981438
2021-05-19 03:05:41 +00:00
TreeHugger Robot
835f507f07 Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 8d1fd73e89 am: e0e26649fb am: fbb3409f9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186629

Change-Id: I0937561c24bc3e1779890b3760c50b8c3d89d69d
2021-05-19 02:58:42 +00:00
TreeHugger Robot
d2f8bd093e Merge "Update apps icon in Sound > Media page to correct size." into sc-dev am: 80daf4fc49 am: 07427eeeb3 am: c38bda35bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410003

Change-Id: I16c0c14a0aec25d5133dead35d9efe9b0db5744c
2021-05-19 02:58:29 +00:00
Yichi Chen
837ff92cd9 Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev am: ffbea30a18 am: 97efa6eed4 am: 3c5b65fb20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352150

Change-Id: If6dadccf0a8a8f9a4710eee0fa8e8e8abe8a1b2f
2021-05-19 02:58:21 +00:00
TreeHugger Robot
c3b453e52c Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev am: 001dcc9e93 am: 21f81feb86 am: f7191fd0a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409961

Change-Id: I9b4871c0fb436953504be29fad1f4f9068f970c3
2021-05-19 02:58:12 +00:00