Commit Graph

88237 Commits

Author SHA1 Message Date
tim peng
16394b6681 Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 032b2b20bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782146

Change-Id: Ic5777b461d45a9ba9f35e613cc319adc706e1720
2021-06-03 07:38:44 +00:00
Betty Chang
2984c85600 Merge "[GAR] Set the correct color and style to panel UI" into sc-dev am: 5b23f3b923 am: 58e04237c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800153

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

Change-Id: I2e4f112d3d1a4ef5fde0610079234544a3cacc58
2021-06-03 07:37:56 +00:00
Betty Chang
d1ce9256dc Merge "Remove Connect to public network for Network Rating Provider" into sc-dev am: f4fafb97ff am: d18caf8fa8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809873

Change-Id: I460a63809a9baab78c70ed2993cd81c46254f6db
2021-06-03 07:37:52 +00:00
tim peng
96f05f6a18 Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 032b2b20bc am: ee96a0d778
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782146

Change-Id: I3f82f02c89436321ec85e6f4f9992785bf0c9449
2021-06-03 07:37:37 +00:00
TreeHugger Robot
a2602865de Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev am: 7e0fb6878d am: 0f0329cc8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801130

Change-Id: Ia93713cdd6700f9492d94a3209f89fe53df4ff8a
2021-06-03 07:36:36 +00:00
Betty Chang
6c33002fa2 Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev am: 227f9357ab am: 8814da830f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786144

Change-Id: I09ae20496295a87e9acece35a5279a4d795f9189
2021-06-03 07:36:30 +00:00
Bonian Chen
9626d169c3 Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev am: b71dd1efd2 am: 7e5fcd42b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788603

Change-Id: I9e2ef08b1247f3c8e4a4262f91720ba7f9d1fcb0
2021-06-03 07:36:25 +00:00
Kevin Chyn
14a17199e0 Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079 am: cf3a9b989f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: I522362e67625dd2fd565d925e1263270c7c6e773
2021-06-03 07:36:19 +00:00
Trevor Black
a23dfc232b Merge "Remove extra app info setting under specific condition" into sc-dev am: 6c0a701540 am: 3cf1728e78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788858

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

Change-Id: I98cff1d6d9cc03e0a33c066e3683771532994b69
2021-06-03 07:33:39 +00:00
Kunhung Li
bebc5063d2 Merge "Refine wallpaper search keywords" into sc-dev am: a19c7053a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758322

Change-Id: I277dbe3339dee202925b2e055bcfd57e660b89d6
2021-06-03 07:31:46 +00:00
Les Lee
5294e3f9ab wifi direct: Close the channel after leaving the Setting page
Bug: 188375791
Bug: 184504089
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I4eff0472fd3cb12e006b5e85f5cdb6b979c93fe5
2021-06-03 15:31:28 +08:00
Jason Chiu
f979426151 Merge "Revise homepage colors" into sc-dev am: 132cc2127b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797776

Change-Id: Iaa68b01d4b50767dab1052d1573ccf79e86e7573
2021-06-03 07:30:44 +00:00
TreeHugger Robot
dbdb22e423 Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev am: 7e0fb6878d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801130

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

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

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

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

Change-Id: I657d34ebebf3ce89c568f4afed2166d58ee5d339
2021-06-03 07:28:38 +00:00
Betty Chang
ba209f63aa Merge "[GAR] Set the correct color and style to panel UI" into sc-dev am: 5b23f3b923
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800153

Change-Id: Id90d59ad863d4a872563d936031c8261b86dafa8
2021-06-03 07:26:37 +00:00
Betty Chang
16fc9f7a50 Merge "Remove Connect to public network for Network Rating Provider" into sc-dev am: f4fafb97ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809873

Change-Id: Ie121b2766f25ade627bb727e0788271779a7c42c
2021-06-03 07:26:30 +00:00
Betty Chang
58e04237c8 Merge "[GAR] Set the correct color and style to panel UI" into sc-dev am: 5b23f3b923
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800153

Change-Id: I16cda9264d779fce79cc8bf93f25b290a320f93a
2021-06-03 07:25:56 +00:00
Betty Chang
d18caf8fa8 Merge "Remove Connect to public network for Network Rating Provider" into sc-dev am: f4fafb97ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809873

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

Change-Id: Ic834876f7a9ce6e467d33acd5d526231053ac910
2021-06-03 07:21:52 +00:00
Betty Chang
5b23f3b923 Merge "[GAR] Set the correct color and style to panel UI" into sc-dev 2021-06-03 07:21:17 +00:00
Betty Chang
f4fafb97ff Merge "Remove Connect to public network for Network Rating Provider" into sc-dev 2021-06-03 07:21:04 +00:00
tim peng
94fbcf042b Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 032b2b20bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782146

Change-Id: Ie4f2da1eec2cdb71c9b112afedce9816138b0025
2021-06-03 07:18:48 +00:00
tim peng
ee96a0d778 Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 032b2b20bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782146

Change-Id: I405c34349758d79aa9fff506491324615e4d824b
2021-06-03 07:15:43 +00:00
tim peng
032b2b20bc Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev 2021-06-03 07:03:37 +00:00
Janis Danisevskis
9ab6d471b4 Merge "Enable the clear credentials buttons when wifi keys are installed." into sc-dev am: 04fdd614b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14791340

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

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

Change-Id: I17da7d979ed50493b6e6de574e72716746a72df7
2021-06-03 06:45:27 +00:00
TreeHugger Robot
f3125b7d99 Merge "Fix slider RTL problem" into sc-dev am: 7bebe57631
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788607

Change-Id: I008a18d9e183099fe1fe41fcc4fc9484f89a500f
2021-06-03 06:45:22 +00:00
TreeHugger Robot
9ba96e3d30 Merge "Fix voice access problem on location page." into sc-dev am: 89fbeb6407
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782145

Change-Id: Iaac39f73a0ff5fa7c9f3e55a8f25302d9059b25e
2021-06-03 06:45:16 +00:00
TreeHugger Robot
d38e7e2568 Merge "Update battery defender tip subtext" into sc-dev am: 2702e5ce80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788605

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

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

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

Change-Id: Ibf7dc474c7340e636be1626cfd51f3d5847cd1a6
2021-06-03 06:41:40 +00:00
Menghan Li
7f352f0030 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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702759

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

Change-Id: Id3bcdd00f6cfe30454bd53a070e9793031aaf321
2021-06-03 06:41:28 +00:00
Les Lee
9d89f8fc86 Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786726

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

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

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

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

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

Change-Id: I35927c0b212ab83aa4c49bd082c6c0d5fdcf3cf9
2021-06-03 06:32:47 +00:00
ykhung
6ba22a3b9a Remove missed added testing locale to cause flaky
Bug: 189998237
Test: make SettingsRoboTests
Change-Id: Id36c72ff8eee02c1e64f29a0dbefa0eb9804845a
2021-06-03 14:24:18 +08:00
TreeHugger Robot
de4277e102 Merge "Fix overlapping problem on running services page" into sc-dev am: 28128df960 am: f09ee2983d am: eab1381514
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800150

Change-Id: Icaec436e298a460ad17af62867c064452351539e
2021-06-03 05:49:51 +00:00
TreeHugger Robot
eab1381514 Merge "Fix overlapping problem on running services page" into sc-dev am: 28128df960 am: f09ee2983d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800150

Change-Id: Iece29034d9d822723de9306d9663c205d9062c83
2021-06-03 05:28:52 +00:00
TreeHugger Robot
96d22f4efa Merge "Fix overlapping problem on running services page" into sc-dev am: 28128df960
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800150

Change-Id: Ie2b302acb5d05951e1962482120ee1b70c092fea
2021-06-03 05:11:13 +00:00