From 5dbe2af7465fa08cf65995c44d9c6fb1338a089b Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Fri, 13 Aug 2021 12:46:35 +0800 Subject: [PATCH] [Provider Model] Cherry-pick from master ag/15008434, ag/15023697 and ag/15023698 Add InternetAdapter for Wi-Fi network in internet dialog - Set each Wi-Fi entry into recycle view - Add InternetAdapterTest for unit test Add InternetDialog for showing current networks - Set mobile data layout - Set connected Wi-Fi layout - Set recycle view and adapter for Wi-Fi entries - Add InternetDialogTest for unit test Launch InternetDialog from tile and onReceive - Call from SystemUI: Inject - Call from outside: Receiver Bug: 187779230 Test: build pass Change-Id: Ib127ad43831ada06fa6a07802b3648b30faac5b0 Merged-In: Ib127ad43831ada06fa6a07802b3648b30faac5b0 --- .../res/drawable/ic_arrow_forward.xml | 26 + .../res/drawable/ic_friction_lock_closed.xml | 26 + .../res/drawable/ic_settings_24dp.xml | 29 + .../drawable/internet_dialog_background.xml | 23 + .../internet_dialog_footer_background.xml | 30 + ...t_dialog_rounded_top_corner_background.xml | 22 + .../settingslib_switch_bar_bg_disabled.xml | 26 + .../drawable/settingslib_switch_bar_bg_on.xml | 26 + .../drawable/settingslib_thumb_disabled.xml | 33 ++ .../res/drawable/settingslib_thumb_off.xml | 31 + .../res/drawable/settingslib_thumb_on.xml | 31 + .../drawable/settingslib_thumb_selector.xml | 22 + .../settingslib_track_disabled_background.xml | 26 + .../settingslib_track_off_background.xml | 24 + .../settingslib_track_on_background.xml | 24 + .../drawable/settingslib_track_selector.xml | 22 + .../layout/internet_connectivity_dialog.xml | 351 +++++++++++ .../res/layout/internet_list_item.xml | 99 ++++ packages/SystemUI/res/values/colors.xml | 14 +- packages/SystemUI/res/values/dimens.xml | 28 + packages/SystemUI/res/values/styles.xml | 39 ++ .../src/com/android/systemui/Dependency.java | 3 + .../systemui/qs/tiles/InternetTile.java | 17 +- .../qs/tiles/dialog/InternetAdapter.java | 228 ++++++++ .../qs/tiles/dialog/InternetDialog.java | 552 ++++++++++++++++++ .../qs/tiles/dialog/InternetDialogFactory.kt | 62 ++ .../policy/NetworkControllerImpl.java | 17 +- .../qs/tiles/dialog/InternetAdapterTest.java | 102 ++++ .../qs/tiles/dialog/InternetDialogTest.java | 245 ++++++++ 29 files changed, 2174 insertions(+), 4 deletions(-) create mode 100644 packages/SystemUI/res/drawable/ic_arrow_forward.xml create mode 100644 packages/SystemUI/res/drawable/ic_friction_lock_closed.xml create mode 100644 packages/SystemUI/res/drawable/ic_settings_24dp.xml create mode 100644 packages/SystemUI/res/drawable/internet_dialog_background.xml create mode 100644 packages/SystemUI/res/drawable/internet_dialog_footer_background.xml create mode 100644 packages/SystemUI/res/drawable/internet_dialog_rounded_top_corner_background.xml create mode 100644 packages/SystemUI/res/drawable/settingslib_switch_bar_bg_disabled.xml create mode 100644 packages/SystemUI/res/drawable/settingslib_switch_bar_bg_on.xml create mode 100644 packages/SystemUI/res/drawable/settingslib_thumb_disabled.xml create mode 100644 packages/SystemUI/res/drawable/settingslib_thumb_off.xml create mode 100644 packages/SystemUI/res/drawable/settingslib_thumb_on.xml create mode 100644 packages/SystemUI/res/drawable/settingslib_thumb_selector.xml create mode 100644 packages/SystemUI/res/drawable/settingslib_track_disabled_background.xml create mode 100644 packages/SystemUI/res/drawable/settingslib_track_off_background.xml create mode 100644 packages/SystemUI/res/drawable/settingslib_track_on_background.xml create mode 100644 packages/SystemUI/res/drawable/settingslib_track_selector.xml create mode 100644 packages/SystemUI/res/layout/internet_connectivity_dialog.xml create mode 100644 packages/SystemUI/res/layout/internet_list_item.xml create mode 100644 packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java create mode 100644 packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java create mode 100644 packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogFactory.kt create mode 100644 packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetAdapterTest.java create mode 100644 packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java diff --git a/packages/SystemUI/res/drawable/ic_arrow_forward.xml b/packages/SystemUI/res/drawable/ic_arrow_forward.xml new file mode 100644 index 0000000000000..438e4c70dc716 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_arrow_forward.xml @@ -0,0 +1,26 @@ + + + + diff --git a/packages/SystemUI/res/drawable/ic_friction_lock_closed.xml b/packages/SystemUI/res/drawable/ic_friction_lock_closed.xml new file mode 100644 index 0000000000000..2c34060ccd61f --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_friction_lock_closed.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/packages/SystemUI/res/drawable/ic_settings_24dp.xml b/packages/SystemUI/res/drawable/ic_settings_24dp.xml new file mode 100644 index 0000000000000..ac4c43bd35b91 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_settings_24dp.xml @@ -0,0 +1,29 @@ + + + + + + diff --git a/packages/SystemUI/res/drawable/internet_dialog_background.xml b/packages/SystemUI/res/drawable/internet_dialog_background.xml new file mode 100644 index 0000000000000..3ceb0f6ac06ae --- /dev/null +++ b/packages/SystemUI/res/drawable/internet_dialog_background.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/internet_dialog_footer_background.xml b/packages/SystemUI/res/drawable/internet_dialog_footer_background.xml new file mode 100644 index 0000000000000..50267fda0b25e --- /dev/null +++ b/packages/SystemUI/res/drawable/internet_dialog_footer_background.xml @@ -0,0 +1,30 @@ + + + + + + + + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/internet_dialog_rounded_top_corner_background.xml b/packages/SystemUI/res/drawable/internet_dialog_rounded_top_corner_background.xml new file mode 100644 index 0000000000000..14672ef3dcfe9 --- /dev/null +++ b/packages/SystemUI/res/drawable/internet_dialog_rounded_top_corner_background.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/packages/SystemUI/res/drawable/settingslib_switch_bar_bg_disabled.xml b/packages/SystemUI/res/drawable/settingslib_switch_bar_bg_disabled.xml new file mode 100644 index 0000000000000..088e82bb42601 --- /dev/null +++ b/packages/SystemUI/res/drawable/settingslib_switch_bar_bg_disabled.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/settingslib_switch_bar_bg_on.xml b/packages/SystemUI/res/drawable/settingslib_switch_bar_bg_on.xml new file mode 100644 index 0000000000000..250188b892f44 --- /dev/null +++ b/packages/SystemUI/res/drawable/settingslib_switch_bar_bg_on.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/settingslib_thumb_disabled.xml b/packages/SystemUI/res/drawable/settingslib_thumb_disabled.xml new file mode 100644 index 0000000000000..b41762f7908e2 --- /dev/null +++ b/packages/SystemUI/res/drawable/settingslib_thumb_disabled.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/settingslib_thumb_off.xml b/packages/SystemUI/res/drawable/settingslib_thumb_off.xml new file mode 100644 index 0000000000000..8b69ad1b2493b --- /dev/null +++ b/packages/SystemUI/res/drawable/settingslib_thumb_off.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/settingslib_thumb_on.xml b/packages/SystemUI/res/drawable/settingslib_thumb_on.xml new file mode 100644 index 0000000000000..0f27fc2f4ad88 --- /dev/null +++ b/packages/SystemUI/res/drawable/settingslib_thumb_on.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/settingslib_thumb_selector.xml b/packages/SystemUI/res/drawable/settingslib_thumb_selector.xml new file mode 100644 index 0000000000000..06bb779b91ef5 --- /dev/null +++ b/packages/SystemUI/res/drawable/settingslib_thumb_selector.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/packages/SystemUI/res/drawable/settingslib_track_disabled_background.xml b/packages/SystemUI/res/drawable/settingslib_track_disabled_background.xml new file mode 100644 index 0000000000000..15dfcb70e25e6 --- /dev/null +++ b/packages/SystemUI/res/drawable/settingslib_track_disabled_background.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/packages/SystemUI/res/drawable/settingslib_track_off_background.xml b/packages/SystemUI/res/drawable/settingslib_track_off_background.xml new file mode 100644 index 0000000000000..4d79a6e20776a --- /dev/null +++ b/packages/SystemUI/res/drawable/settingslib_track_off_background.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/packages/SystemUI/res/drawable/settingslib_track_on_background.xml b/packages/SystemUI/res/drawable/settingslib_track_on_background.xml new file mode 100644 index 0000000000000..c12d012a0508a --- /dev/null +++ b/packages/SystemUI/res/drawable/settingslib_track_on_background.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/packages/SystemUI/res/drawable/settingslib_track_selector.xml b/packages/SystemUI/res/drawable/settingslib_track_selector.xml new file mode 100644 index 0000000000000..a38c3b4241a3c --- /dev/null +++ b/packages/SystemUI/res/drawable/settingslib_track_selector.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml new file mode 100644 index 0000000000000..fddff0b1eb0ff --- /dev/null +++ b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml @@ -0,0 +1,351 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +