Commit Graph

87805 Commits

Author SHA1 Message Date
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
ce064482cd 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: I03bbc5361392321d43c7d6eb1873df384a29d8ad
2021-06-03 09:32:06 +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
Hugh Chen
10e4599219 Fix phishing attacks over Bluetooth due to unclear warning message
This CL add more prompts presented for users to avoid phishing attacks.

Screenshot:
https://screenshot.googleplex.com/p5PZbphN46ddPFV.png
https://screenshot.googleplex.com/6Q2wKfPbNQmTtx8.png
https://screenshot.googleplex.com/987VpYgNUZL2K4T.png
https://screenshot.googleplex.com/9eVg6SAGScVXU8U.png

Bug: 167403112
Test: manually test
Change-Id: Iadec059b662fd91754ad573bbe688702cdd3c9af
2021-06-03 16:42:09 +08:00
YUKAI HUNG
83d97a9e1c 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: I23bc6382dbe300689347f6397411e04b15e9dee9
2021-06-03 08:21:00 +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
1da8b1909d 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: I6936974270bd665aa01d5b563f4312605842a725
2021-06-03 07:39:20 +00:00
Betty Chang
8689d3ebc1 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: I675fa7fc41dd061792bd4133a99b487b9dc516eb
2021-06-03 07:39:02 +00:00
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
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