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

Commit 80a7afe8 authored by Ying Xu's avatar Ying Xu Committed by Automerger Merge Worker
Browse files

Merge "Remove the activity info from InternetTile" into tm-qpr-dev am: b250c79e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20642503



Change-Id: Icac533d657e13726a5754c49ec77c7fce242f496
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a1d1c43 b250c79e

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

+0 −16
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ public class InternetTile extends QSTileImpl<SignalState> { 
        int mWifiSignalIconId;

        @Nullable

        String mSsid;

        boolean mActivityIn;

        boolean mActivityOut;

        @Nullable

        String mWifiSignalContentDescription;

        boolean mIsTransient;
@@ -203,8 +201,6 @@ public class InternetTile extends QSTileImpl<SignalState> { 
                    .append(",mConnected=").append(mConnected)

                    .append(",mWifiSignalIconId=").append(mWifiSignalIconId)

                    .append(",mSsid=").append(mSsid)

                    .append(",mActivityIn=").append(mActivityIn)

                    .append(",mActivityOut=").append(mActivityOut)

                    .append(",mWifiSignalContentDescription=").append(mWifiSignalContentDescription)

                    .append(",mIsTransient=").append(mIsTransient)

                    .append(",mNoDefaultNetwork=").append(mNoDefaultNetwork)
@@ -222,8 +218,6 @@ public class InternetTile extends QSTileImpl<SignalState> { 
        CharSequence mDataContentDescription;

        int mMobileSignalIconId;

        int mQsTypeIcon;

        boolean mActivityIn;

        boolean mActivityOut;

        boolean mNoSim;

        boolean mRoaming;

        boolean mMultipleSubs;
@@ -239,8 +233,6 @@ public class InternetTile extends QSTileImpl<SignalState> { 
                .append(",mDataContentDescription=").append(mDataContentDescription)

                .append(",mMobileSignalIconId=").append(mMobileSignalIconId)

                .append(",mQsTypeIcon=").append(mQsTypeIcon)

                .append(",mActivityIn=").append(mActivityIn)

                .append(",mActivityOut=").append(mActivityOut)

                .append(",mNoSim=").append(mNoSim)

                .append(",mRoaming=").append(mRoaming)

                .append(",mMultipleSubs=").append(mMultipleSubs)
@@ -271,8 +263,6 @@ public class InternetTile extends QSTileImpl<SignalState> { 
            mWifiInfo.mWifiSignalContentDescription = indicators.qsIcon.contentDescription;

            mWifiInfo.mEnabled = indicators.enabled;

            mWifiInfo.mSsid = indicators.description;

            mWifiInfo.mActivityIn = indicators.activityIn;

            mWifiInfo.mActivityOut = indicators.activityOut;

            mWifiInfo.mIsTransient = indicators.isTransient;

            mWifiInfo.mStatusLabel = indicators.statusLabel;

            refreshState(mWifiInfo);
@@ -293,8 +283,6 @@ public class InternetTile extends QSTileImpl<SignalState> { 
                    ? indicators.typeContentDescriptionHtml : null;

            mCellularInfo.mMobileSignalIconId = indicators.qsIcon.icon;

            mCellularInfo.mQsTypeIcon = indicators.qsType;

            mCellularInfo.mActivityIn = indicators.activityIn;

            mCellularInfo.mActivityOut = indicators.activityOut;

            mCellularInfo.mRoaming = indicators.roaming;

            mCellularInfo.mMultipleSubs = mController.getNumberSubscriptions() > 1;

            refreshState(mCellularInfo);
@@ -424,8 +412,6 @@ public class InternetTile extends QSTileImpl<SignalState> { 
        state.state = Tile.STATE_ACTIVE;

        state.dualTarget = true;

        state.value = cb.mEnabled;

        state.activityIn = cb.mEnabled && cb.mActivityIn;

        state.activityOut = cb.mEnabled && cb.mActivityOut;

        final StringBuffer minimalContentDescription = new StringBuffer();

        final StringBuffer minimalStateDescription = new StringBuffer();

        final Resources r = mContext.getResources();
@@ -499,8 +485,6 @@ public class InternetTile extends QSTileImpl<SignalState> { 
        boolean mobileDataEnabled = mDataController.isMobileDataSupported()

                && mDataController.isMobileDataEnabled();

        state.value = mobileDataEnabled;

        state.activityIn = mobileDataEnabled && cb.mActivityIn;

        state.activityOut = mobileDataEnabled && cb.mActivityOut;

        state.expandedAccessibilityClassName = Switch.class.getName();



        if (cb.mAirplaneModeEnabled && cb.mQsTypeIcon != TelephonyIcons.ICON_CWF) {