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

Commit e66d5ea4 authored by Evan Laird's avatar Evan Laird
Browse files

Move interfaces out of NetworkController 

This CL moves some interface and class definitions out of
NetworkController. AccessPointController and SignalCallback get their
own files, and MobileDataIndicators and WifiIndicators both moved to the
SignalCallback kt file.

This doesn't simplify things just yet, but it does clean up imports and
interfaces, and moving the *Indicators classes to kotlin gives us the
data class niceties.

Test: atest SystemUITests
Bug: 197851948
Change-Id: I6eba271cdc28d81bc1d281eab2e6c230f4ad89cb
parent 7c1c6a69

packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java

+7 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.qs.carrier; 
import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES;



import android.annotation.MainThread;

import android.annotation.NonNull;

import android.content.Context;

import android.content.Intent;

import android.os.Handler;
@@ -42,8 +43,10 @@ import com.android.systemui.dagger.qualifiers.Background; 
import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.statusbar.connectivity.IconState;

import com.android.systemui.statusbar.connectivity.MobileDataIndicators;

import com.android.systemui.statusbar.connectivity.NetworkController;

import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators;

import com.android.systemui.statusbar.connectivity.SignalCallback;

import com.android.systemui.util.CarrierConfigTracker;



import java.util.function.Consumer;
@@ -81,10 +84,9 @@ public class QSCarrierGroupController { 


    private final SlotIndexResolver mSlotIndexResolver;



    private final NetworkController.SignalCallback mSignalCallback =

            new NetworkController.SignalCallback() {

    private final SignalCallback mSignalCallback = new SignalCallback() {

                @Override

                public void setMobileDataIndicators(MobileDataIndicators indicators) {

                public void setMobileDataIndicators(@NonNull MobileDataIndicators indicators) {

                    if (mProviderModel) {

                        return;

                    }
@@ -109,7 +111,7 @@ public class QSCarrierGroupController { 
                }



                @Override

                public void setCallIndicator(NetworkController.IconState statusIcon, int subId) {

                public void setCallIndicator(@NonNull IconState statusIcon, int subId) {

                    if (!mProviderModel) {

                        return;

                    }

packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java

+5 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.qs.tiles; 


import static android.media.MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY;



import android.annotation.NonNull;

import android.app.Dialog;

import android.content.Context;

import android.content.Intent;
@@ -52,7 +53,8 @@ import com.android.systemui.qs.QSHost; 
import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.tileimpl.QSTileImpl;

import com.android.systemui.statusbar.connectivity.NetworkController;

import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators;

import com.android.systemui.statusbar.connectivity.SignalCallback;

import com.android.systemui.statusbar.connectivity.WifiIndicators;

import com.android.systemui.statusbar.phone.SystemUIDialog;

import com.android.systemui.statusbar.policy.CastController;

import com.android.systemui.statusbar.policy.CastController.CastDevice;
@@ -273,10 +275,9 @@ public class CastTile extends QSTileImpl<BooleanState> { 
        return mWifiConnected || mHotspotConnected;

    }



    private final NetworkController.SignalCallback mSignalCallback =

            new NetworkController.SignalCallback() {

    private final SignalCallback mSignalCallback = new SignalCallback() {

                @Override

                public void setWifiIndicators(WifiIndicators indicators) {

                public void setWifiIndicators(@NonNull WifiIndicators indicators) {

                    // statusIcon.visible has the connected status information

                    boolean enabledAndConnected = indicators.enabled

                            && (indicators.qsIcon == null ? false : indicators.qsIcon.visible);

packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java

+6 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.qs.tiles; 


import static com.android.systemui.Prefs.Key.QS_HAS_TURNED_OFF_MOBILE_DATA;



import android.annotation.NonNull;

import android.app.AlertDialog;

import android.app.AlertDialog.Builder;

import android.content.Context;
@@ -56,10 +57,10 @@ import com.android.systemui.qs.QSHost; 
import com.android.systemui.qs.SignalTileView;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.tileimpl.QSTileImpl;

import com.android.systemui.statusbar.connectivity.IconState;

import com.android.systemui.statusbar.connectivity.MobileDataIndicators;

import com.android.systemui.statusbar.connectivity.NetworkController;

import com.android.systemui.statusbar.connectivity.NetworkController.IconState;

import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators;

import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback;

import com.android.systemui.statusbar.connectivity.SignalCallback;

import com.android.systemui.statusbar.phone.SystemUIDialog;



import javax.inject.Inject;
@@ -269,7 +270,7 @@ public class CellularTile extends QSTileImpl<SignalState> { 
        private final CallbackInfo mInfo = new CallbackInfo();



        @Override

        public void setMobileDataIndicators(MobileDataIndicators indicators) {

        public void setMobileDataIndicators(@NonNull MobileDataIndicators indicators) {

            if (indicators.qsIcon == null) {

                // Not data sim, don't display.

                return;
@@ -291,7 +292,7 @@ public class CellularTile extends QSTileImpl<SignalState> { 
        }



        @Override

        public void setIsAirplaneMode(IconState icon) {

        public void setIsAirplaneMode(@NonNull IconState icon) {

            mInfo.airplaneModeEnabled = icon.visible;

            refreshState(mInfo);

        }

packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java

+9 −8
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.qs.tiles;



import android.annotation.NonNull;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;
@@ -52,13 +53,13 @@ import com.android.systemui.qs.QSHost; 
import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.tileimpl.QSTileImpl;

import com.android.systemui.qs.tiles.dialog.InternetDialogFactory;

import com.android.systemui.statusbar.connectivity.AccessPointController;

import com.android.systemui.statusbar.connectivity.IconState;

import com.android.systemui.statusbar.connectivity.MobileDataIndicators;

import com.android.systemui.statusbar.connectivity.NetworkController;

import com.android.systemui.statusbar.connectivity.NetworkController.AccessPointController;

import com.android.systemui.statusbar.connectivity.NetworkController.IconState;

import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators;

import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback;

import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators;

import com.android.systemui.statusbar.connectivity.SignalCallback;

import com.android.systemui.statusbar.connectivity.WifiIcons;

import com.android.systemui.statusbar.connectivity.WifiIndicators;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -250,7 +251,7 @@ public class InternetTile extends QSTileImpl<SignalState> { 




        @Override

        public void setWifiIndicators(WifiIndicators indicators) {

        public void setWifiIndicators(@NonNull WifiIndicators indicators) {

            if (DEBUG) {

                Log.d(TAG, "setWifiIndicators: " + indicators);

            }
@@ -271,7 +272,7 @@ public class InternetTile extends QSTileImpl<SignalState> { 
        }



        @Override

        public void setMobileDataIndicators(MobileDataIndicators indicators) {

        public void setMobileDataIndicators(@NonNull MobileDataIndicators indicators) {

            if (DEBUG) {

                Log.d(TAG, "setMobileDataIndicators: " + indicators);

            }
@@ -293,7 +294,7 @@ public class InternetTile extends QSTileImpl<SignalState> { 
        }



        @Override

        public void setEthernetIndicators(IconState icon) {

        public void setEthernetIndicators(@NonNull IconState icon) {

            if (DEBUG) {

                Log.d(TAG, "setEthernetIndicators: "

                        + "icon = " + (icon == null ? "" :  icon.toString()));

packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java

+6 −5
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.qs.tiles;



import android.annotation.NonNull;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;
@@ -52,11 +53,11 @@ import com.android.systemui.qs.QSHost; 
import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.tileimpl.QSIconViewImpl;

import com.android.systemui.qs.tileimpl.QSTileImpl;

import com.android.systemui.statusbar.connectivity.AccessPointController;

import com.android.systemui.statusbar.connectivity.NetworkController;

import com.android.systemui.statusbar.connectivity.NetworkController.AccessPointController;

import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback;

import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators;

import com.android.systemui.statusbar.connectivity.SignalCallback;

import com.android.systemui.statusbar.connectivity.WifiIcons;

import com.android.systemui.statusbar.connectivity.WifiIndicators;

import com.android.wifitrackerlib.WifiEntry;



import java.util.List;
@@ -310,7 +311,7 @@ public class WifiTile extends QSTileImpl<SignalState> { 
        final CallbackInfo mInfo = new CallbackInfo();



        @Override

        public void setWifiIndicators(WifiIndicators indicators) {

        public void setWifiIndicators(@NonNull WifiIndicators indicators) {

            if (DEBUG) Log.d(TAG, "onWifiSignalChanged enabled=" + indicators.enabled);

            if (indicators.qsIcon == null) {

                return;
@@ -332,7 +333,7 @@ public class WifiTile extends QSTileImpl<SignalState> { 
    }



    protected class WifiDetailAdapter implements DetailAdapter,

            NetworkController.AccessPointController.AccessPointCallback, QSDetailItems.Callback {

            AccessPointController.AccessPointCallback, QSDetailItems.Callback {



        private QSDetailItems mItems;

        private WifiEntry[] mAccessPoints;