Commit Graph

83497 Commits

Author SHA1 Message Date
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
Amit Mahajan
10a77391fe Merge "Fix incorrect logging." into sc-dev am: 6402ac45e6 am: 748bbd8a06 am: 93b4b46cf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330728

Change-Id: Ieab741c898b72bd2dfc9f4048c3b6f9b5adf21b9
2021-05-16 12:42:42 +00:00
Matt Pietal
98fa222811 Merge "SUW - Apply theme to FRP PIN pages" into sc-dev am: 0ddacf1152 am: eadf475e12 am: d17b6d022a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339991

Change-Id: I93b5404916608793bd666bce6e3beb79d88b8a79
2021-05-16 12:42:35 +00:00
Tom Hsu
c66db025c2 Merge "[ApnEditor] Create another string id for translation" into sc-dev am: 58fb70f8d6 am: 0a930e3e91 am: 7c7f779b71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327014

Change-Id: I2f56641f9024811ab72db843b75d80bf8ba7811f
2021-05-16 12:42:29 +00:00
Wesley Wang
baaf2528c8 Merge "Make app usage page active time support time period" into sc-dev am: 04e14e41f0 am: ec3961fab1 am: 37fa9c79fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297857

Change-Id: I95f3255373400e0fc6a68e7323888bc443749225
2021-05-16 12:42:23 +00:00
Tsung-Mao Fang
66640f55b1 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 697a73dfdf -s ours am: c12e5f2455 -s ours am: ea699a1d2c -s ours am: 2e807e4f0b -s ours am: 96a4e396fb -s ours
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history

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

Change-Id: I7e849ec60b94eee516b724ed415dd2ad8405c333
2021-05-16 12:42:17 +00:00
Tsung-Mao Fang
e93f24a315 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 656dcf8334 -s ours am: 5fb1fd0ca8 -s ours am: bb4c367e7d -s ours am: 7e98abea92 -s ours
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history

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

Change-Id: I2f551901f9eeb195b74ce5185a724aa5ebd2f824
2021-05-16 12:42:00 +00:00
PETER LIANG
01fa89f737 Merge "Update the BC style for the vision settings in SuW." into sc-dev am: 9246f6f8b0 am: 5db9770aba am: fb789f0c06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319864

Change-Id: I74fa4aedb3408d1e102f1884b0e64028e02a76d6
2021-05-16 12:41:44 +00:00
TreeHugger Robot
b85fd1350d Merge "Settings: Turn Privacy hub on by default." into sc-dev am: 7bdbe80abe am: d481442b83 am: 42c65e6b49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339809

Change-Id: Ib52daca012efedc7dd27a845bf2f5123d4231ef7
2021-05-16 12:41:36 +00:00
TreeHugger Robot
6826430e7f Merge "Fix several challenge paths" into sc-dev am: fcb325c562 am: 1533fd1e11 am: 9891597029
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14342148

Change-Id: Ic8ea57bfc3dac3979d5a489146d33890b1ce02bf
2021-05-16 12:41:31 +00:00
TreeHugger Robot
8fe8200279 Merge "Remove icons of Location Services and App location permissions" into sc-dev am: 3eb980d41b am: 3006e0473b am: 7063ea4ef1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14341501

Change-Id: Ie58196d7552805d89fa162159ff9f76e183d8ab0
2021-05-16 12:41:25 +00:00
TreeHugger Robot
bc429b68ce Merge "Apply settings page transition" into sc-dev am: d3de9a1352 am: cfc3968b4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292669

Change-Id: I0f06edeae744d2eec88737c0630b802918309b4e
2021-05-16 12:41:18 +00:00
TreeHugger Robot
dd84da1983 Merge "Tweak spacing for private DNS mode dialog" into sc-dev am: b07079dab8 am: dd31e73878
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319873

Change-Id: I6e168b5d750f4b4077fd755fe953a859feea48f1
2021-05-16 12:41:12 +00:00
TreeHugger Robot
4082c0b1e5 Merge "Make collapsing toolbar load font synchronously" into sc-dev am: 9d3442bd47 am: 77f7afac7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327008

Change-Id: I699a8b694b4227cb32cbc480bf1890268a8a12e9
2021-05-16 12:41:07 +00:00
Hugh Chen
e96f830c8b Fix usb tethering switch back to none after off/on the screen am: ddafb202bd am: 433dbcc6f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297855

Change-Id: I0b7edc2981d56920ef0253ceccdcd0c134ca7fae
2021-05-16 12:41:01 +00:00
TreeHugger Robot
7e66a3a13a Merge "Bring the search icon back in developer page" into sc-dev am: e06f5a93b1 am: b17996e9bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14293744

Change-Id: Ib18c4f79e28a1bd35187b650698b373f5a63e601
2021-05-16 12:40:56 +00:00
SongFerng Wang
c26f8788f7 Merge "Ui show "No connection" when WiFi is turned on and no available network" into sc-dev am: 03fbae7fc5 am: 3333935a67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14281929

Change-Id: I477a0f9bb7bea46e72dd6aafdc7ed28a111e2a1f
2021-05-16 12:40:41 +00:00
Tom Hsu
45e3441821 Merge "[Provider model] Show no connection during out of service." into sc-dev am: 463805b142 am: 563198613f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187782

Change-Id: Ie03e422ab560dbcb81f4624bcb6c6d4393856941
2021-05-16 12:40:34 +00:00