Commit Graph

87691 Commits

Author SHA1 Message Date
Treehugger Robot
2b98c25bcf Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1725994

Change-Id: I7a48bd13efccbb49ebd57ee298b7b71dd5410060
2021-06-03 10:10:25 +00:00
TreeHugger Robot
6ee940be8a Merge "Fix broken test" into sc-dev am: f8641a4d86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809883

Change-Id: I2196df639936515d02c2543f990494de91db8cee
2021-06-03 10:02:46 +00:00
Syaoran Kuo
0278cde7ed Merge "Adjuest battery saver component test for new logic" into sc-dev am: e4be9a7b62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292665

Change-Id: I231a64099acb408f5ae8e984274bcd8d279b2262
2021-06-03 10:02:16 +00:00
Treehugger Robot
5f1034bce0 Merge "Enable the clear credentials buttons when wifi keys are installed." 2021-06-03 09:56:49 +00:00
TreeHugger Robot
f8641a4d86 Merge "Fix broken test" into sc-dev 2021-06-03 09:55:08 +00:00
Galia Peycheva
7d2c0454f6 Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892 am: 175a8661bd am: 429875ad4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507

Change-Id: I7fab7b07823a9e4e66c5f1f073a6bde240b1b90c
2021-06-03 09:47:59 +00:00
Syaoran Kuo
e4be9a7b62 Merge "Adjuest battery saver component test for new logic" into sc-dev 2021-06-03 09:42:43 +00:00
Les Lee
249de94dea Merge "wifi: Use new API for data usage function" am: c0245bb982 am: 38f9e01f84 am: 88684d39c9 am: d654827f82
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697487

Change-Id: I2180593befc40f41a83bbb791d19403e0688ab4c
2021-06-03 09:34:29 +00:00
Galia Peycheva
429875ad4f Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892 am: 175a8661bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507

Change-Id: I78bce7edb11eb15b037dd6af2f3a1a6bf8a3cb5a
2021-06-03 09:32:13 +00:00
Galia Peycheva
175a8661bd Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507

Change-Id: Ib994e20ef6e0c23f6270a3d224a38bbbe1efd79b
2021-06-03 09:31:00 +00:00
Les Lee
d654827f82 Merge "wifi: Use new API for data usage function" am: c0245bb982 am: 38f9e01f84 am: 88684d39c9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697487

Change-Id: If11a87d067d7044043dd92eaa253d3ba152e2a67
2021-06-03 09:26:08 +00:00
Les Lee
88684d39c9 Merge "wifi: Use new API for data usage function" am: c0245bb982 am: 38f9e01f84
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697487

Change-Id: Ib58a8e48d74ff56ff28859dd635b758762934617
2021-06-03 09:14:20 +00:00
Galia Peycheva
33a9f49892 Merge "Use SettingsLib string for blur developer option" into sc-dev 2021-06-03 09:12:36 +00:00
YUKAI HUNG
c736e56822 Merge "Remove missed added testing locale to cause flaky" into sc-dev am: fa476aef12 am: f1864c0efb am: e4144d397e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809876

Change-Id: I11ba01c1dc7456c2eb568f95ba29d7611e2bf6da
2021-06-03 09:04:20 +00:00
YUKAI HUNG
e4144d397e Merge "Remove missed added testing locale to cause flaky" into sc-dev am: fa476aef12 am: f1864c0efb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809876

Change-Id: I52fbbda3a116c3de86fec1f438c1004d177e6745
2021-06-03 08:43:22 +00:00
Les Lee
38f9e01f84 Merge "wifi: Use new API for data usage function" am: c0245bb982
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697487

Change-Id: I24ba0a9ea96c9d0ff63b691f10a07b900cbbd399
2021-06-03 08:18:16 +00:00
YUKAI HUNG
f1864c0efb Merge "Remove missed added testing locale to cause flaky" into sc-dev am: fa476aef12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809876

Change-Id: I61002511a174b39d69fe6580c4ade4c737bc7d1c
2021-06-03 08:17:20 +00:00
Tsung-Mao Fang
0b9ce16c13 Fix broken test
Fix: 190017630
Test: robo test
Change-Id: I46978a3f3d3d564cd9fcabad47edf6907d4e4966
2021-06-03 16:10:36 +08:00
Betty Chang
ca0f312276 Merge "[GAR] Set the correct color and style to panel UI" into sc-dev am: 5b23f3b923 am: 58e04237c8 am: 2984c85600
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800153

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

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

Change-Id: Ie9ec9163ba38c7cf671d8b7b1374b6069726628b
2021-06-03 07:51:14 +00:00
YUKAI HUNG
fa476aef12 Merge "Remove missed added testing locale to cause flaky" into sc-dev 2021-06-03 07:50:55 +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
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
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
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
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
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