Commit Graph

83271 Commits

Author SHA1 Message Date
TreeHugger Robot
55a07cb3c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bba877accb -s ours am: 03571296d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb0dbfc4d9533a06e806e7879db7561f5a58537f
2021-06-04 02:04:09 +00:00
TreeHugger Robot
a859ca90a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5753862c9e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia29c7e1cf71acf97129f6eacefd235305f6cac36
2021-06-04 02:03:03 +00:00
TreeHugger Robot
b3cf01bb58 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f189c24095 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61307b69d75e10f3800b9f340b4c5bef5dcf46e9
2021-06-04 01:59:43 +00:00
Chloris Kuo
338a62023a Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 8f5ccfaef0 am: c2a0a1c3ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14810398

Change-Id: Ic6b67d495fe6da8f10aed33fad08ecd94f2e67e7
2021-06-04 01:45:43 +00:00
Abel Tesfaye
a38622da57 Merge "Use list+ toggle on devices without face detection" into sc-dev am: 040e5ef894 am: 084d9f864b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14040065

Change-Id: I8037ed7115053c2c0e2fcb4503274c1911f8a545
2021-06-04 01:45:07 +00:00
TreeHugger Robot
dff5fba1af Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev am: 36c45e0ffd am: d4d5f05a99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819338

Change-Id: I72960c890da7b57bf06f69e93dc0a8616d9942f9
2021-06-04 01:45:02 +00:00
Les Lee
700ac83de5 Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev am: c48cf5ee37 am: 44149f10c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786728

Change-Id: Iee311b512e84c594f1617895aef74f576e647aff
2021-06-04 01:44:57 +00:00
TreeHugger Robot
f51bd51aa9 Merge "Fix broken test" into sc-dev am: f8641a4d86 am: 2d68db1cef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809883

Change-Id: Ic413813edec0ef2130515fc527b32877587d3bdd
2021-06-04 01:44:05 +00:00
Syaoran Kuo
053313cd65 Merge "Adjuest battery saver component test for new logic" into sc-dev am: e4be9a7b62 am: 40f15073b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292665

Change-Id: I2cce7d95e40f5c4f3864dd9f752b59ab30d1613d
2021-06-04 01:42:18 +00:00
Galia Peycheva
15fcfd39dd Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892 am: ce064482cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507

Change-Id: I9ab3aac5c0835b73cf17621d815dbb170ed84cbd
2021-06-04 01:28:24 +00:00
YUKAI HUNG
72791522e2 Merge "Remove missed added testing locale to cause flaky" into sc-dev am: fa476aef12 am: 83d97a9e1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809876

Change-Id: Ia471ef0676360201e0ef9fd6b1ee08bdf94a26bd
2021-06-04 01:28:12 +00:00
Betty Chang
e9454809e7 Merge "[GAR] Set the correct color and style to panel UI" into sc-dev am: 5b23f3b923 am: 1da8b1909d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800153

Change-Id: I09e6b60f858bce2952243ad211dade4a50a3c656
2021-06-04 01:28:08 +00:00
Betty Chang
71a557d543 Merge "Remove Connect to public network for Network Rating Provider" into sc-dev am: f4fafb97ff am: 8689d3ebc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809873

Change-Id: I1a8e33e01761a8b8eacf5025e0da0df6d9746ff8
2021-06-04 01:28:04 +00:00
tim peng
6a0ad7486a Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 032b2b20bc am: 16394b6681
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782146

Change-Id: I1b5a635e122563db78b6f7cf9e6a965d309d2d2c
2021-06-04 01:27:59 +00:00
TreeHugger Robot
9f274a5433 Merge "Fix overlapping problem on running services page" into sc-dev am: 28128df960 am: 56a94afcb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800150

Change-Id: I4576833fd023228c85af9d500ea094d037714c88
2021-06-04 01:27:55 +00:00
Yanting Yang
f610c2db07 Merge "Deprecate silky flag for official release" into sc-dev am: 09666f9ef4 am: f52d2b66b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800152

Change-Id: I0a2d113e67b91674edd5867010f5bd35eb61320d
2021-06-04 01:25:57 +00:00
Kunhung Li
99cf70e612 Merge "Refine wallpaper search keywords" into sc-dev am: a19c7053a2 am: bebc5063d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758322

Change-Id: Iabbbf66e7309325c8647d0cad85e8181537cf30a
2021-06-04 01:25:44 +00:00
Jason Chiu
78a51506de Merge "Revise homepage colors" into sc-dev am: 132cc2127b am: f979426151
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797776

Change-Id: I3e849d48e9f6c16b2fc903fe68a443af8f03ada2
2021-06-04 01:25:38 +00:00
TreeHugger Robot
e78e108ead Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev am: 7e0fb6878d am: dbdb22e423
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801130

Change-Id: I90aab1a7295dd63c35ff5ed2d6371ca4bf34977b
2021-06-04 01:25:31 +00:00
Betty Chang
8fb045eee7 Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev am: 227f9357ab am: 6b419f1075
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786144

Change-Id: I56add17bc44875df7e568ed80e549de8a6df1409
2021-06-04 01:25:26 +00:00
Bonian Chen
1d4e97953b Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev am: b71dd1efd2 am: 9ba43f8f75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788603

Change-Id: I8559653c5d2a85d7dc1ddd44b51259bbe7bcc0bc
2021-06-04 01:25:21 +00:00
Kevin Chyn
f8414ceade Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079 am: 7ffcc2a517
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: Ie9b3fd29e48dcecbaafaccd292341d756ced3e4b
2021-06-04 01:25:16 +00:00
Trevor Black
74d830fb7d Merge "Remove extra app info setting under specific condition" into sc-dev am: 6c0a701540 am: 9c5eb35143
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788858

Change-Id: Iaef840ba4da22468cd4a93f363547ee78c762ea7
2021-06-04 01:25:10 +00:00
Curtis Belmonte
5a27beb760 Merge "Align assets and colors for biometric enroll intros" into sc-dev am: 70dfd5332f am: 45c393cad5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795268

Change-Id: If820eeab0ed7fd0c262db2f37edf2865f0e1ba82
2021-06-04 01:25:04 +00:00
Janis Danisevskis
f9043bc840 Merge "Enable the clear credentials buttons when wifi keys are installed." into sc-dev am: 04fdd614b6 am: 9ab6d471b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14791340

Change-Id: Iaba3757353965d26ce6e9cfc05332ff510ad2629
2021-06-04 01:25:00 +00:00
TreeHugger Robot
ffcbb27ebf Merge "Remove silky flag from misc files" into sc-dev am: 55b577dff8 am: 30d79bd7e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797782

Change-Id: I591707323d4c1857b80531da177b88901f42a1bf
2021-06-04 01:24:55 +00:00
TreeHugger Robot
e64a7a67b5 Merge "Remove silky flag for searching and help menu" into sc-dev am: ea2b64a92d am: 83e7e42f25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797777

Change-Id: Ia57436dc0046bcf6de239e3cc50085cdf180db56
2021-06-04 01:24:49 +00:00
TreeHugger Robot
6fd97da723 Merge "Fix slider RTL problem" into sc-dev am: 7bebe57631 am: f3125b7d99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788607

Change-Id: I5fe810c28649cd6b0ea80f390d00dfa6201e35a5
2021-06-04 01:24:44 +00:00
TreeHugger Robot
0253f53344 Merge "Fix voice access problem on location page." into sc-dev am: 89fbeb6407 am: 9ba96e3d30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782145

Change-Id: I319b7eb229d9687415b11e703f7acc4e692d7882
2021-06-04 01:24:39 +00:00
TreeHugger Robot
5ba70378da Merge "Update battery defender tip subtext" into sc-dev am: 2702e5ce80 am: d38e7e2568
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788605

Change-Id: I1ab170f44a38357752bdf54b3be7f606ec35869e
2021-06-04 01:20:16 +00:00
Stanley Wang
57a319f03b Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev am: b4b35a8c38 am: 090c1db54b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758319

Change-Id: Iced7e7be17d5630be9debbef5f1faecc3453768e
2021-06-04 00:48:57 +00:00
TreeHugger Robot
dbbe33cedd Merge "Remove the face unlock category" into sc-dev am: 3af33cd3fc am: 3da51e2fa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732241

Change-Id: I6da1277e11fe7faace90b03af98e61c231b0efd3
2021-06-04 00:48:50 +00:00
TreeHugger Robot
e0e5f2f6a0 Merge "Apply sliding transition to trust agent." into sc-dev am: fffda8de08 am: 5ec95d91ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786716

Change-Id: Ibd4e355a9649412da22aec9c1ce19cc2dcdf7395
2021-06-04 00:48:45 +00:00
Menghan Li
38c8b94682 Merge "Fix the link text "Learn more" in the accessibility pages with help links could not convey the link's purpose clearly" into sc-dev am: 58ed6a90fe am: 7f352f0030
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702759

Change-Id: I88b440123fc565d427fcf56956872ac8cb34889f
2021-06-04 00:48:40 +00:00
Wesley Wang
a43e630d64 Merge "Update battery settings string" into sc-dev am: e678e2da06 am: d2d83c7bdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788594

Change-Id: I2f0f717012c2094326489158f5c7b7afdb64d2f4
2021-06-04 00:44:54 +00:00
Les Lee
01361fc0eb [automerger skipped] Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda am: 9d89f8fc86 -s ours
am skip reason: Merged-In I6fbec14e7be4dc4b5c2fd3659a801521c81b233c with SHA-1 5012cef58f is already in history

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

Change-Id: I96169606034c8872400b64651a1f34c8a91f0135
2021-06-04 00:40:06 +00:00
Wesley Wang
4863d514fd Merge "Update battery error layout" into sc-dev am: 431e77d429 am: 80bb5b005e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758085

Change-Id: I6d835f4202e10457860fd449ee8c4fe552b01e21
2021-06-04 00:25:00 +00:00
TreeHugger Robot
0c5627ef4a Merge "Remove all dividers in privacy page" into sc-dev am: 2076ebf2f7 am: 975ddf380c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786727

Change-Id: I477c205f7cca6646d175800f1b49aa231c4ec36e
2021-06-04 00:24:56 +00:00
TreeHugger Robot
b5ec85872d Merge "Fix biometric content overlap with top/bottom bars" into sc-dev am: 9a839db046 am: fb0cacb30f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14752842

Change-Id: I5e2d28837f45e79d2450ea93c377b7e9f19a71c0
2021-06-04 00:24:51 +00:00
Abel Tesfaye
1f02129c95 Merge "Update smart auto rotate string" into sc-dev am: 0dbbd148d5 am: 8b9c1ce735
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504138

Change-Id: I2bc81a26210219eeabab8ff94f0457d8bfaf7009
2021-06-04 00:24:46 +00:00
TreeHugger Robot
3796ef53c2 Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev am: 9e1e5ddb72 am: 8eb8bfec86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14700128

Change-Id: Ife384bfc3f3d850e945e06a264a1025ec96c654e
2021-06-04 00:24:36 +00:00
TreeHugger Robot
4acb047d94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 37e8f3f696 -s ours am: ee2d493495 -s ours am: 81a9df9fb1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I16b51d2d7d45c1f410552e5d1c388b90fadfcf98
2021-06-03 19:53:48 +00:00
Bill Yi
b0555c8618 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 79ef9e3fc8 -s ours am: fc601649d9 -s ours am: 5b3ee99393 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icfe1706c49e6f1dd371c33400f863d5d78caad6c
2021-06-03 19:53:43 +00:00
TreeHugger Robot
5d4d92d52f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 23e3a2b7f2 -s ours am: 7221374cb4 -s ours am: 308295f4cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9dacd41206037eb37748266bff5e3104da05546b
2021-06-03 19:53:39 +00:00
Bill Yi
6e4420138f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6df7694b57 -s ours am: aaa1ec13a4 -s ours am: 8501fcf38e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I12bf774e282ba690c49acb2669d438b54c9279e7
2021-06-03 19:53:30 +00:00
TreeHugger Robot
4334f338b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b475f57f13 -s ours am: 1476c1a9e9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f75b3090a2e67304b99e77f76ef7421c0a654f8
2021-06-03 19:53:18 +00:00
TreeHugger Robot
b241f49bee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bba877accb -s ours am: 9ed875897b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I370da9ef15cccdaf47db9ad06ff4f5cf287faa0e
2021-06-03 19:52:53 +00:00
TreeHugger Robot
81a9df9fb1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 37e8f3f696 -s ours am: ee2d493495 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e11e1e2c546bc0f34e9c902216587d71eb24349
2021-06-03 19:37:11 +00:00
Bill Yi
5b3ee99393 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 79ef9e3fc8 -s ours am: fc601649d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idebe376bbf278200a780e455f362f17a68dd818a
2021-06-03 19:36:42 +00:00
TreeHugger Robot
03571296d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bba877accb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9999c2060159c0373b3fe50e922e19326b76157a
2021-06-03 19:36:36 +00:00