Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d921138 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[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
parent c7c881a0

packages/SystemUI/res/layout/new_status_bar_wifi_group.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiView.kt→packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarWifiView.kt

+1 −1
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -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