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
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
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
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
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
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
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
8df821e089
Merge "Deprecate silky flag for official release" into sc-dev am: 09666f9ef4 am: 4dadee105a am: e98ad64676
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800152
Change-Id: Ifd57cadcb18247d0b2edb776523e46c6c66f79e1
2021-06-03 04:33:11 +00:00
Kunhung Li
84c929c2dd
Merge "Refine wallpaper search keywords" into sc-dev am: a19c7053a2 am: be25d20c6a am: fbdaa4fc45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758322
Change-Id: I649361184ddb02309deb74c1039f513b25a847f5
2021-06-03 04:32:39 +00:00
Jason Chiu
8e01b31b63
Merge "Revise homepage colors" into sc-dev am: 132cc2127b am: cbb49b6f3f am: 7bd0f02a73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797776
Change-Id: I5b9c0beb705c6cc9c06726173719beed1315dd89
2021-06-03 04:32:32 +00:00
TreeHugger Robot
8a465df6bf
Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev am: 7e0fb6878d am: 004f16a8cf am: 079d72ac09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801130
Change-Id: Icbca0eb9dde134450d1704525d080f218b533a60
2021-06-03 04:32:21 +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
TreeHugger Robot
0f0329cc8b
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: Ie6b9c4b7b0743cf79b013acd14bc9588753077f5
2021-06-03 03:59:18 +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
Curtis Belmonte
d9aac76cd6
Merge "Align assets and colors for biometric enroll intros" into sc-dev am: 70dfd5332f am: 3b1b093d6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795268
Change-Id: I3f43a045e6271995dd54126b2e577a774dbd7479
2021-06-03 03:41:37 +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