Commit Graph

82631 Commits

Author SHA1 Message Date
TreeHugger Robot
fb8d1ab61b Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev am: 36c45e0ffd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819338

Change-Id: I08afbbf499563ef1fa818fbf4a10cbc2a951c244
2021-06-03 14:22:19 +00:00
Les Lee
0c4c0e5e33 Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev am: c48cf5ee37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786728

Change-Id: If754ac8946aa0e6faf3fba705b15b4fe1519c3ae
2021-06-03 14:22:10 +00:00
TreeHugger Robot
36c45e0ffd Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev 2021-06-03 14:09:08 +00:00
Les Lee
c48cf5ee37 Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev 2021-06-03 14:08:51 +00:00
Zoey Chen
3251ab68f9 [Settings] Modify the ordering of mobile plan preference.
Bug: 189409514
Test: make
Change-Id: I76a04b9c38ead0e3b9a2a4a21b50660caa15632b
2021-06-03 20:02:01 +08:00
Treehugger Robot
8e34fc722f [automerger skipped] Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0 am: 2b98c25bcf -s ours
am skip reason: Merged-In I69828b64a7e3c707c27b4582d64ff0ddb863a4ff with SHA-1 fae7509721 is already in history

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

Change-Id: I8979806a6b599663c2eddc500bc9ca518ca16080
2021-06-03 10:26:13 +00:00
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
Syaoran Kuo
e4be9a7b62 Merge "Adjuest battery saver component test for new logic" into sc-dev 2021-06-03 09:42:43 +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
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
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
YUKAI HUNG
fa476aef12 Merge "Remove missed added testing locale to cause flaky" into sc-dev 2021-06-03 07:50:55 +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
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
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
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
f09ee2983d 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: I0d0e6024ff1ad86d009570cff19984da30c2f341
2021-06-03 05:09:14 +00:00
TreeHugger Robot
28128df960 Merge "Fix overlapping problem on running services page" into sc-dev 2021-06-03 04:55:23 +00:00
Yanting Yang
4dadee105a 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: I9bb58d58df5d9ba6938952b88d4bdec7985a81f9
2021-06-03 04:22:57 +00:00
Yanting Yang
09666f9ef4 Merge "Deprecate silky flag for official release" into sc-dev 2021-06-03 04:05:26 +00:00
Kunhung Li
be25d20c6a 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: I7a5b12ff8812c10ede4e157c15f5963d488ac58a
2021-06-03 03:57:31 +00:00
Jason Chiu
cbb49b6f3f 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: I045d589aa0593e1bd33fe0724f6456fcd00020a5
2021-06-03 03:57:24 +00:00
TreeHugger Robot
004f16a8cf 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: I1fdfcfeeddb0a07b8904f6dc3299bd7c4ce3fd7d
2021-06-03 03:57:10 +00:00
Tsung-Mao Fang
ff0c73bfcb Fix overlapping problem on running services page
For Android S, all pages support collpasing tool bar.
We add coordinatorLayout to work with collpasing tool bar
layout. And coordinatorLayout only works with RecyclerView
and NestedScrollView.
Unfortunately, the list was implemented by listView many years ago.

Because it's a very hidden page and the page is not maintained anymore,
we don't consider to migrate to RecyclerView.
Simply enable nested scrolling behavior for listview at this moment.

I also make some small refactorings in this cl.
1) Update the layout padding.
2) Format the xml file.
3) Create a individual cl for this page only.

Test: Don't see the overlapping problem
Fix: 188539741
Change-Id: I21c61e35a06b85ca7c309d1d3182b38b4bb38212
2021-06-03 11:41:14 +08:00
Kunhung Li
a19c7053a2 Merge "Refine wallpaper search keywords" into sc-dev 2021-06-03 03:34:27 +00:00
Jason Chiu
132cc2127b Merge "Revise homepage colors" into sc-dev 2021-06-03 03:31:06 +00:00
TreeHugger Robot
7e0fb6878d Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev 2021-06-03 03:28:42 +00:00
changbetty
de57c12412 Remove Connect to public network for Network Rating Provider
According we remove the Network Rating Provider in ag/14675092, and the
Connect to public network item is tied to the Network Rating Provider.
So need to remove together.

Bug: 187119482
Test: Manaul test
      make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiSettingsTest
Change-Id: Ie8a8d5c8d9f2c5db11d6c9e6f84af7864e78814f
2021-06-03 11:22:19 +08:00
Betty Chang
b62f95a47a 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: I6de2cbcb0089500f1ce5fc689356a7a226c8cfe0
2021-06-03 02:33:50 +00:00
Bonian Chen
4cf2c2b10f 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: Iac562f776c021db8f8a59a29504f45fa96778b07
2021-06-03 02:33:32 +00:00
Betty Chang
227f9357ab Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev 2021-06-03 02:33:12 +00:00
Bonian Chen
b71dd1efd2 Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev 2021-06-03 02:17:06 +00:00
Janis Danisevskis
552992ac12 Enable the clear credentials buttons when wifi keys are installed.
This patch updates the ResetCredentialsPreferenceController to check the
WIFI keystore namespace if called by the primary user.

Test: Install a WIFI certificate or key and watch the
      "Clear credentials" button become enabled in the credential
      storage dialog of Settings.
Bug: 189601008
Merged-In: I69828b64a7e3c707c27b4582d64ff0ddb863a4ff
Change-Id: I69828b64a7e3c707c27b4582d64ff0ddb863a4ff
2021-06-02 16:46:18 -07:00
Kevin Chyn
924105b7d8 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: Ia28780a2596557e4e8028f6564734162f69d0086
2021-06-02 20:22:27 +00:00
Kevin Chyn
ef963fe079 Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev 2021-06-02 20:03:38 +00:00
Trevor Black
220f6d734a 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: I8dd53d4e08b465acf7272c6c91338b2acd1f575f
2021-06-02 18:20:38 +00:00
Trevor Black
6c0a701540 Merge "Remove extra app info setting under specific condition" into sc-dev 2021-06-02 18:13:01 +00:00
Curtis Belmonte
07b4452662 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: Ifbbe941fe90343c6ec4c3885173417aca4874a1a
2021-06-02 18:09:46 +00:00
Curtis Belmonte
70dfd5332f Merge "Align assets and colors for biometric enroll intros" into sc-dev 2021-06-02 17:42:35 +00:00