Les Lee
54ef94eded
Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev am: c48cf5ee37
am: 0c4c0e5e33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786728
Change-Id: I352a679b8e247c0215f8c5890f3a99e7fae23de3
2021-06-03 14:45:24 +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
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
Treehugger Robot
394f87fb3d
[automerger skipped] Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0
am: 2b98c25bcf
-s ours am: 8e34fc722f
-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: I61d0e3fc95ac7609109302c7ca9fa8db6f8347fd
2021-06-03 10:27:42 +00:00
TreeHugger Robot
7076e28e95
Merge "Fix broken test" into sc-dev am: f8641a4d86
am: 6ee940be8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809883
Change-Id: I297b0cf052903f189788a08e60348b593bccddc4
2021-06-03 10:27:37 +00:00
Syaoran Kuo
de68d97f8f
Merge "Adjuest battery saver component test for new logic" into sc-dev am: e4be9a7b62
am: 0278cde7ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292665
Change-Id: I605edc87a9e26838bcc13f0fb48a40ac8473be47
2021-06-03 10:27:18 +00: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
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
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
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
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
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
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
e98ad64676
Merge "Deprecate silky flag for official release" into sc-dev am: 09666f9ef4
am: 4dadee105a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800152
Change-Id: I75a80121110a4c1bb23a26e64a6cddb6ad1434ae
2021-06-03 04:25:35 +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
Kunhung Li
fbdaa4fc45
Merge "Refine wallpaper search keywords" into sc-dev am: a19c7053a2
am: be25d20c6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758322
Change-Id: I1362aaeed2005545a7a3a8a608d91dde8968a2cb
2021-06-03 04:17:02 +00:00
Jason Chiu
7bd0f02a73
Merge "Revise homepage colors" into sc-dev am: 132cc2127b
am: cbb49b6f3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797776
Change-Id: I8e9ea4624b8575d1d283b4c674d525c4b5ff444c
2021-06-03 04:16:56 +00:00
TreeHugger Robot
079d72ac09
Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev am: 7e0fb6878d
am: 004f16a8cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801130
Change-Id: I8fa5c4cb98bb2a8fe6b78ebdfe655108be48526f
2021-06-03 04:16:48 +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