From 8d921138b06ab528a9b0af74e7a6600f42c39a96 Mon Sep 17 00:00:00 2001
From: Caitlin Shkuratov <caitlinshk@google.com>
Date: Tue, 27 Dec 2022 16:48:11 +0000
Subject: [PATCH] [SB Refactor] Move ModernStatusBarWifiView to shared.

It'll be re-named and have the wifi-specific logic removed in the next
CL.

Bug: 238425913
Test: verify wifi icon still tints correctly
Change-Id: Icb1150bc37755caac395e8048be9b32ef78fe731
---
 packages/SystemUI/res/layout/new_status_bar_wifi_group.xml    | 4 ++--
 .../com/android/systemui/statusbar/phone/DemoStatusIcons.java | 2 +-
 .../systemui/statusbar/phone/StatusBarIconController.java     | 2 +-
 .../{wifi => shared}/ui/view/ModernStatusBarWifiView.kt       | 2 +-
 .../pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt      | 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename packages/SystemUI/src/com/android/systemui/statusbar/pipeline/{wifi => shared}/ui/view/ModernStatusBarWifiView.kt (98%)

diff --git a/packages/SystemUI/res/layout/new_status_bar_wifi_group.xml b/packages/SystemUI/res/layout/new_status_bar_wifi_group.xml
index 753ba2f21faf4..fc90c438b363b 100644
--- a/packages/SystemUI/res/layout/new_status_bar_wifi_group.xml
+++ b/packages/SystemUI/res/layout/new_status_bar_wifi_group.xml
@@ -16,7 +16,7 @@
 ** limitations under the License.
 */
 -->
-<com.android.systemui.statusbar.pipeline.wifi.ui.view.ModernStatusBarWifiView
+<com.android.systemui.statusbar.pipeline.shared.ui.view.ModernStatusBarWifiView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/wifi_combo"
     android:layout_width="wrap_content"
@@ -25,4 +25,4 @@
 
     <include layout="@layout/status_bar_wifi_group_inner" />
 
-</com.android.systemui.statusbar.pipeline.wifi.ui.view.ModernStatusBarWifiView>
+</com.android.systemui.statusbar.pipeline.shared.ui.view.ModernStatusBarWifiView>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java
index c72eb054c62c6..b946be3018da3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java
@@ -42,7 +42,7 @@ import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.MobileIconStat
 import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState;
 import com.android.systemui.statusbar.pipeline.mobile.ui.view.ModernStatusBarMobileView;
 import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.MobileIconsViewModel;
-import com.android.systemui.statusbar.pipeline.wifi.ui.view.ModernStatusBarWifiView;
+import com.android.systemui.statusbar.pipeline.shared.ui.view.ModernStatusBarWifiView;
 import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.LocationBasedWifiViewModel;
 
 import java.util.ArrayList;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
index 1a14a03637630..3a7a6730e65fb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
@@ -55,7 +55,7 @@ import com.android.systemui.statusbar.pipeline.mobile.ui.binder.MobileIconsBinde
 import com.android.systemui.statusbar.pipeline.mobile.ui.view.ModernStatusBarMobileView;
 import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.MobileIconsViewModel;
 import com.android.systemui.statusbar.pipeline.wifi.ui.WifiUiAdapter;
-import com.android.systemui.statusbar.pipeline.wifi.ui.view.ModernStatusBarWifiView;
+import com.android.systemui.statusbar.pipeline.shared.ui.view.ModernStatusBarWifiView;
 import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.LocationBasedWifiViewModel;
 import com.android.systemui.util.Assert;
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarWifiView.kt
similarity index 98%
rename from packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiView.kt
rename to packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarWifiView.kt
index f89b623273ed0..e252e0c23a39e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiView.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarWifiView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.systemui.statusbar.pipeline.wifi.ui.view
+package com.android.systemui.statusbar.pipeline.shared.ui.view
 
 import android.content.Context
 import android.graphics.Rect
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt
index 59c10cd6df7cb..3efa25e8f7b00 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt
@@ -40,6 +40,7 @@ import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneMod
 import com.android.systemui.statusbar.pipeline.shared.ConnectivityConstants
 import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger
 import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository
+import com.android.systemui.statusbar.pipeline.shared.ui.view.ModernStatusBarWifiView
 import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
 import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository
 import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor