Commit Graph

84150 Commits

Author SHA1 Message Date
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
YUKAI HUNG
4d0751ed5d Merge "Add new field for data interpolation usage" into sc-dev am: f988790908 am: b6213e31cd am: 899c8cbac0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409677

Change-Id: I31da33ad5149efa0e30b40ac973042f2dfb37c49
2021-05-16 13:05:17 +00:00
Ryan Lin
cd38f4894c Merge "Move Magnification Mode Settings to the main page" into sc-dev am: 194015b774 am: 46c74bb532 am: 3757065866
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327003

Change-Id: Idffbe38e8fbd3507dd3f86f4bd3810f3e5caf525
2021-05-16 13:04:57 +00:00
Menghan Li
9e5f236a96 Merge "[Material Next] Update accessibility tool footer style" into sc-dev am: da60d4e842 am: a4b50627d6 am: 74a3ac0261
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260604

Change-Id: I0fdd6ed12baf1844517e9b10b3a03b95afcb0013
2021-05-16 13:04:51 +00:00
Menghan Li
de45114f46 Merge "Hide the accessibility location preference when gesture navigation mode enabled." into sc-dev am: c7ddea6aa8 am: a2366c6ca3 am: 116482fe22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408665

Change-Id: Ia2c5c5823c238d24c585854732da075198554c23
2021-05-16 13:04:44 +00:00
Menghan Li
efbfa7cabc Merge "[Material Next] Audio adjustment customized seekbar" into sc-dev am: 8270d175b8 am: a5d87f58fb am: 17abc929db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409958

Change-Id: I99f6431834b4dc79d710c882904e274ed2433ebf
2021-05-16 13:04:38 +00:00
TreeHugger Robot
86dadb9827 Merge "Revert "Refine battery help message layout"" into sc-dev am: c3dc96ebc3 am: c86d347865 am: 6834c52ab9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409960

Change-Id: Id14abbb4cf96b0f52ed9c5b2ee5dc4f8061b01c1
2021-05-16 13:04:32 +00:00
Mill Chen
5d84c3eb62 Increasing the character limit am: b4a9916adf am: 342f784228 am: 895befa0d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408673

Change-Id: I74678ed1f03c14eb78a1f432ee91c781e0a9de89
2021-05-16 13:04:26 +00:00
TreeHugger Robot
bfb8c719c4 Merge "Update password & account settings icon size" into sc-dev am: b0bd79d468 am: 7246cb06cc am: 0c609415a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408664

Change-Id: I18af328faef458a959ca4fd4f6ad598ba5590c7b
2021-05-16 13:04:20 +00:00
TreeHugger Robot
d57ab468de Merge "Fix the unaligned title of injected items" into sc-dev am: d32e0cf8a6 am: 37683cc0bc am: 61e89eaa1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408661

Change-Id: Ib81b1fa47821d82f0ccb9295b329358a5900a5b2
2021-05-16 13:04:14 +00:00
TreeHugger Robot
be28453bbf Merge "Update the category style in pair new device page." into sc-dev am: dc0613d172 am: 3460bbe7ec am: 76ddefe726
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408656

Change-Id: I544a523ecef3dfbb9148439ee673c0dee0f607bf
2021-05-16 13:04:08 +00:00
Wesley.CW Wang
57aac8d5fa Refine battery help message layout am: 2369167d63 am: 75e9eb213b am: 16130db7b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352143

Change-Id: Ie16ee292485080db59272d0a06d586cff658e251
2021-05-16 13:04:02 +00:00
Wesley Wang
a31939b3bd Merge "Update batter saver page footer (1/2)" into sc-dev am: 12bc0921ce am: 7b6793bd06 am: cc3d6d818d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352147

Change-Id: I6ddb262b85db09fa58cdc3bf7d5512cd461ec9b5
2021-05-16 13:03:53 +00:00
YUKAI HUNG
a7b983fc36 Merge "Refine the app/system section divider content show/hide rule" into sc-dev am: 16b60aa2d7 am: d337c33474 am: 766f0e4c77
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327009

Change-Id: I6323879679dd8fe496c88ad734114dcee136c53c
2021-05-16 12:44:46 +00:00
Bill Yi
b8136a5872 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f1ae5d67a -s ours am: f03c567697 -s ours am: f2eb8dc4d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I445fdeda5b6392ba4c513999ecf216d39d347054
2021-05-16 12:44:17 +00:00
TreeHugger Robot
fe0be1f2c1 Merge "[Security Report] Fix RequestToggleWiFiActivity overlaid issue" into sc-dev am: 6907a1feb8 am: 598e7456f2 am: 6e7c049c36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352470

Change-Id: I356abd40dcbd4a6da0f932477a94dcc9d8f71526
2021-05-16 12:44:12 +00:00
TreeHugger Robot
98087a87c1 Merge "Add placeholder values to placeholder settings" into sc-dev am: fb2e8837f1 am: 570ef9d8da am: c7174aaed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356125

Change-Id: I1ae231240822fc1673a2bb9c323a739c544202de
2021-05-16 12:44:06 +00:00
TreeHugger Robot
5d9dedf424 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 01aeea2e4a -s ours am: b1802372ab -s ours am: c830499aa5 -s ours am: 390d29bf2c -s ours am: 520800b85b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie6c7461214fd67c80a02783c9e48a604c586c7b0
2021-05-16 12:44:00 +00:00
Bill Yi
17eb99a106 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56 -s ours am: b702fdea6d -s ours am: 226146afee -s ours am: c9b99fbf00 -s ours am: 11d3658112 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6dc8f51bd313f91c8ff6b018aedd163a71e0f95b
2021-05-16 12:43:53 +00:00
TreeHugger Robot
7b5698aaca Merge "Retain and restore showSystem state when rotated" into sc-dev am: 8f8666e3d0 am: 56a3e57991 am: 5f9b1866df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356126

Change-Id: I3286e48a3109124acde6df8e7b0418a35ccae563
2021-05-16 12:43:47 +00:00
TreeHugger Robot
63d19a74f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fb47f1e143 -s ours am: bf0ef5b73a -s ours am: 26fb969e07 -s ours am: 765a422ef8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I70f3a142db57d32837df95c5f6ee9f1d63b94f7a
2021-05-16 12:43:41 +00:00
Bill Yi
147301007d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6bb78b6d1b -s ours am: ff5e910f46 -s ours am: 7ed3955572 -s ours am: 6e48fa7abf -s ours
am skip reason: subject contains skip directive

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

Change-Id: If9195c7d3040509e943f9741193ae0505f2f54be
2021-05-16 12:43:36 +00:00
TreeHugger Robot
f513638f95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6c7771a521 -s ours am: 016f441365 -s ours am: b32fd28bc0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If94f590ffeaaf06aa96fbfb3968c6e268ca74e20
2021-05-16 12:43:14 +00:00
TreeHugger Robot
2a2df28f63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 041b99ccd5 -s ours am: e30f685d83 -s ours am: 58bc66b149 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I821c57f6c28fbecbb39b2ebcc950136e02d8e85b
2021-05-16 12:43:09 +00:00
Menghan Li
9755b67ad8 Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev am: 1576980095 am: 3e0080956d am: a52bf99fd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299189

Change-Id: I9491d048f48e57f5eff15b67328f0ab543239274
2021-05-16 12:43:02 +00:00
Almaz Mingaleev
3e02295b00 Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev am: c51cefb2b9 am: e291bcfdd8 am: af9aa076df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353668

Change-Id: I541e583a01642298325a1952f5ad7bdeb1821f0a
2021-05-16 12:42:54 +00:00
Yi Jiang
de8779d73b Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: 16b0f660ae am: 2b25a6cec4 am: 240ef2d1e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114425

Change-Id: I846ff120ff1257d4747488415767d08b647dd4f8
2021-05-16 12:42:48 +00:00