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

Commit 5bba501a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "wifi-constants" into tm-qpr-dev 

* changes:
  [Sb refactor] Mobile icon view model logging
  [Sb refactor] Add logging to mobile connections pipeline
  [Sb refactor] Move shouldShowActivityConfig to ConnectivityConstants
  [Sb refactor] Add location to mobile view models
parents 3e92172c 81799a75

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

+4 −1
Original line number Diff line number Diff line
@@ -60,10 +60,12 @@ public class DemoStatusIcons extends StatusIconContainer implements DemoMode, Da 
    private int mColor;



    private final MobileIconsViewModel mMobileIconsViewModel;

    private final StatusBarLocation mLocation;



    public DemoStatusIcons(

            LinearLayout statusIcons,

            MobileIconsViewModel mobileIconsViewModel,

            StatusBarLocation location,

            int iconSize

    ) {

        super(statusIcons.getContext());
@@ -71,6 +73,7 @@ public class DemoStatusIcons extends StatusIconContainer implements DemoMode, Da 
        mIconSize = iconSize;

        mColor = DarkIconDispatcher.DEFAULT_ICON_TINT;

        mMobileIconsViewModel = mobileIconsViewModel;

        mLocation = location;



        if (statusIcons instanceof StatusIconContainer) {

            setShouldRestrictIcons(((StatusIconContainer) statusIcons).isRestrictingIcons());
@@ -287,7 +290,7 @@ public class DemoStatusIcons extends StatusIconContainer implements DemoMode, Da 
        ModernStatusBarMobileView view = ModernStatusBarMobileView.constructAndBind(

                mobileContext,

                "mobile",

                mMobileIconsViewModel.viewModelForSub(subId)

                mMobileIconsViewModel.viewModelForSub(subId, mLocation)

        );



        // mobile always goes at the end

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

+11 −4
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ public interface StatusBarIconController { 
        // Whether or not these icons show up in dumpsys

        protected boolean mShouldLog = false;

        private StatusBarIconController mController;

        private final StatusBarLocation mLocation;



        // Enables SystemUI demo mode to take effect in this group

        protected boolean mDemoable = true;
@@ -381,11 +382,12 @@ public interface StatusBarIconController { 
            mContext = group.getContext();

            mIconSize = mContext.getResources().getDimensionPixelSize(

                    com.android.internal.R.dimen.status_bar_icon_size);

            mLocation = location;



            if (statusBarPipelineFlags.runNewMobileIconsBackend()) {

                // This starts the flow for the new pipeline, and will notify us of changes if

                // {@link StatusBarPipelineFlags#useNewMobileIcons} is also true.

                mMobileIconsViewModel = mobileUiAdapter.createMobileIconsViewModel();

                mMobileIconsViewModel = mobileUiAdapter.getMobileIconsViewModel();

                MobileIconsBinder.bind(mGroup, mMobileIconsViewModel);

            } else {

                mMobileIconsViewModel = null;
@@ -394,7 +396,7 @@ public interface StatusBarIconController { 
            if (statusBarPipelineFlags.runNewWifiIconBackend()) {

                // This starts the flow for the new pipeline, and will notify us of changes if

                // {@link StatusBarPipelineFlags#useNewWifiIcon} is also true.

                mWifiViewModel = wifiUiAdapter.bindGroup(mGroup, location);

                mWifiViewModel = wifiUiAdapter.bindGroup(mGroup, mLocation);

            } else {

                mWifiViewModel = null;

            }
@@ -569,7 +571,7 @@ public interface StatusBarIconController { 
                    .constructAndBind(

                            mobileContext,

                            slot,

                            mMobileIconsViewModel.viewModelForSub(subId)

                            mMobileIconsViewModel.viewModelForSub(subId, mLocation)

                        );

        }
@@ -705,7 +707,12 @@ public interface StatusBarIconController { 
        }



        protected DemoStatusIcons createDemoStatusIcons() {

            return new DemoStatusIcons((LinearLayout) mGroup, mMobileIconsViewModel, mIconSize);

            return new DemoStatusIcons(

                    (LinearLayout) mGroup,

                    mMobileIconsViewModel,

                    mLocation,

                    mIconSize

            );

        }

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/MobileConnectionModel.kt

+71 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import android.telephony.TelephonyCallback.ServiceStateListener 
import android.telephony.TelephonyCallback.SignalStrengthsListener

import android.telephony.TelephonyDisplayInfo

import android.telephony.TelephonyManager

import com.android.systemui.log.table.Diffable

import com.android.systemui.log.table.TableRowLogger

import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState.Disconnected

import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
@@ -79,4 +81,72 @@ data class MobileConnectionModel( 
     * [TelephonyDisplayInfo.getNetworkType]. This is used to look up the proper network type icon

     */

    val resolvedNetworkType: ResolvedNetworkType = ResolvedNetworkType.UnknownNetworkType,

)
 
) : Diffable<MobileConnectionModel> {

    override fun logDiffs(prevVal: MobileConnectionModel, row: TableRowLogger) {

        if (prevVal.dataConnectionState != dataConnectionState) {

            row.logChange(COL_CONNECTION_STATE, dataConnectionState.toString())

        }



        if (prevVal.isEmergencyOnly != isEmergencyOnly) {

            row.logChange(COL_EMERGENCY, isEmergencyOnly)

        }



        if (prevVal.isRoaming != isRoaming) {

            row.logChange(COL_ROAMING, isRoaming)

        }



        if (prevVal.operatorAlphaShort != operatorAlphaShort) {

            row.logChange(COL_OPERATOR, operatorAlphaShort)

        }



        if (prevVal.isGsm != isGsm) {

            row.logChange(COL_IS_GSM, isGsm)

        }



        if (prevVal.cdmaLevel != cdmaLevel) {

            row.logChange(COL_CDMA_LEVEL, cdmaLevel)

        }



        if (prevVal.primaryLevel != primaryLevel) {

            row.logChange(COL_PRIMARY_LEVEL, primaryLevel)

        }



        if (prevVal.dataActivityDirection != dataActivityDirection) {

            row.logChange(COL_ACTIVITY_DIRECTION, dataActivityDirection.toString())

        }



        if (prevVal.carrierNetworkChangeActive != carrierNetworkChangeActive) {

            row.logChange(COL_CARRIER_NETWORK_CHANGE, carrierNetworkChangeActive)

        }



        if (prevVal.resolvedNetworkType != resolvedNetworkType) {

            row.logChange(COL_RESOLVED_NETWORK_TYPE, resolvedNetworkType.toString())

        }

    }



    override fun logFull(row: TableRowLogger) {

        row.logChange(COL_CONNECTION_STATE, dataConnectionState.toString())

        row.logChange(COL_EMERGENCY, isEmergencyOnly)

        row.logChange(COL_ROAMING, isRoaming)

        row.logChange(COL_OPERATOR, operatorAlphaShort)

        row.logChange(COL_IS_GSM, isGsm)

        row.logChange(COL_CDMA_LEVEL, cdmaLevel)

        row.logChange(COL_PRIMARY_LEVEL, primaryLevel)

        row.logChange(COL_ACTIVITY_DIRECTION, dataActivityDirection.toString())

        row.logChange(COL_CARRIER_NETWORK_CHANGE, carrierNetworkChangeActive)

        row.logChange(COL_RESOLVED_NETWORK_TYPE, resolvedNetworkType.toString())

    }



    companion object {

        const val COL_EMERGENCY = "EmergencyOnly"

        const val COL_ROAMING = "Roaming"

        const val COL_OPERATOR = "OperatorName"

        const val COL_IS_GSM = "IsGsm"

        const val COL_CDMA_LEVEL = "CdmaLevel"

        const val COL_PRIMARY_LEVEL = "PrimaryLevel"

        const val COL_CONNECTION_STATE = "ConnectionState"

        const val COL_ACTIVITY_DIRECTION = "DataActivity"

        const val COL_CARRIER_NETWORK_CHANGE = "CarrierNetworkChangeActive"

        const val COL_RESOLVED_NETWORK_TYPE = "NetworkType"

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/NetworkNameModel.kt

+29 −3
Original line number Diff line number Diff line
@@ -21,22 +21,48 @@ import android.telephony.TelephonyManager.EXTRA_DATA_SPN 
import android.telephony.TelephonyManager.EXTRA_PLMN

import android.telephony.TelephonyManager.EXTRA_SHOW_PLMN

import android.telephony.TelephonyManager.EXTRA_SHOW_SPN

import com.android.systemui.log.table.Diffable

import com.android.systemui.log.table.TableRowLogger



/**

 * Encapsulates the data needed to show a network name for a mobile network. The data is parsed from

 * the intent sent by [android.telephony.TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED].

 */

sealed interface NetworkNameModel {

sealed interface NetworkNameModel : Diffable<NetworkNameModel> {

    val name: String



    /** The default name is read from [com.android.internal.R.string.lockscreen_carrier_default] */

    data class Default(override val name: String) : NetworkNameModel

    data class Default(override val name: String) : NetworkNameModel {

        override fun logDiffs(prevVal: NetworkNameModel, row: TableRowLogger) {

            if (prevVal !is Default || prevVal.name != name) {

                row.logChange(COL_NETWORK_NAME, "Default($name)")

            }

        }



        override fun logFull(row: TableRowLogger) {

            row.logChange(COL_NETWORK_NAME, "Default($name)")

        }

    }



    /**

     * This name has been derived from telephony intents. see

     * [android.telephony.TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED]

     */

    data class Derived(override val name: String) : NetworkNameModel

    data class Derived(override val name: String) : NetworkNameModel {

        override fun logDiffs(prevVal: NetworkNameModel, row: TableRowLogger) {

            if (prevVal !is Derived || prevVal.name != name) {

                row.logChange(COL_NETWORK_NAME, "Derived($name)")

            }

        }



        override fun logFull(row: TableRowLogger) {

            row.logChange(COL_NETWORK_NAME, "Derived($name)")

        }

    }



    companion object {

        const val COL_NETWORK_NAME = "networkName"

    }

}



fun Intent.toNetworkNameModel(separator: String): NetworkNameModel? {

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.telephony.SubscriptionInfo 
import android.telephony.SubscriptionManager

import android.telephony.TelephonyCallback

import android.telephony.TelephonyManager

import com.android.systemui.log.table.TableLogBuffer

import com.android.systemui.statusbar.pipeline.mobile.data.model.MobileConnectionModel

import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel

import kotlinx.coroutines.flow.Flow
@@ -39,6 +40,13 @@ import kotlinx.coroutines.flow.StateFlow 
interface MobileConnectionRepository {

    /** The subscriptionId that this connection represents */

    val subId: Int



    /**

     * The table log buffer created for this connection. Will have the name "MobileConnectionLog

     * [subId]"

     */

    val tableLogBuffer: TableLogBuffer



    /**

     * A flow that aggregates all necessary callbacks from [TelephonyCallback] into a single

     * listener + model.