Commit Graph

87727 Commits

Author SHA1 Message Date
Galia Peycheva
162e2a0a67 Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892 am: ce064482cd am: 15fcfd39dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I9664188df01c5398f4d0035d4ca051c45d75519f
2021-06-04 01:55:54 +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
832f01eb9c Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev am: b4b35a8c38 am: 090c1db54b am: 57a319f03b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758319

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

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

Change-Id: I376870e8d4de57038475cf97ca94a68ab0b78df4
2021-06-04 01:13:43 +00:00
Menghan Li
45725f719c 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 am: 38c8b94682
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702759

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

Change-Id: I372cae62ff3779cb02b5fca722f6f58da29af41e
2021-06-04 01:13:29 +00:00
Les Lee
0d33d07f55 [automerger skipped] Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda am: 9d89f8fc86 -s ours am: 01361fc0eb -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: Id95e5ce93e639f534c76b44c59775a30db5fb663
2021-06-04 01:05:38 +00:00
Wesley Wang
747aaae2c3 Merge "Update battery error layout" into sc-dev am: 431e77d429 am: 80bb5b005e am: 4863d514fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758085

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

Change-Id: Ib0815ecbbd4cbb9d2c476966d724368d26e48176
2021-06-04 01:05:16 +00:00