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

Commit 4c16eb50 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

For 1 sim devices, hide signal empty state 

For multi sim device, continue to show all mobile cell indicators in the
status bar.

Fixes: 133402064
Test: mp sysuig; demo mode
Change-Id: Iddac804488028388c9d4f8eedbfe14b424473d98
parent fc6a0c45

packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java

+11 −4
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public class SignalDrawable extends DrawableWrapper { 
    private static final int NUM_LEVEL_MASK = 0xff << NUM_LEVEL_SHIFT;

    private static final int STATE_SHIFT = 16;

    private static final int STATE_MASK = 0xff << STATE_SHIFT;

    private static final int STATE_EMPTY = 1;

    private static final int STATE_CUT = 2;

    private static final int STATE_CARRIER_CHANGE = 3;
@@ -203,7 +204,7 @@ public class SignalDrawable extends DrawableWrapper { 
            drawDotAndPadding(x - dotSpacing * 2, y, dotPadding, dotSize, 0);

            canvas.drawPath(mCutoutPath, mTransparentPaint);

            canvas.drawPath(mForegroundPath, mForegroundPaint);

        } else if (isInState(STATE_CUT)) {

        } else if (isInState(STATE_CUT) || isInState(STATE_EMPTY)) {

            float cut = (CUT_OUT * width);

            mCutoutPath.moveTo(width - padding, height - padding);

            mCutoutPath.rLineTo(-cut, 0);
@@ -268,13 +269,14 @@ public class SignalDrawable extends DrawableWrapper { 
    /**

     * Returns whether this drawable is in the specified state.

     *

     * @param state must be one of {@link #STATE_CARRIER_CHANGE} or {@link #STATE_CUT}

     * @param state must be one of {@link #STATE_CARRIER_CHANGE}, {@link #STATE_CUT},

     *              or {@link #STATE_EMPTY}.

     */

    private boolean isInState(int state) {

        return getState(getLevel()) == state;

    }



    public static int getState(int fullState) {

    private static int getState(int fullState) {

        return (fullState & STATE_MASK) >> STATE_SHIFT;

    }
@@ -286,7 +288,12 @@ public class SignalDrawable extends DrawableWrapper { 


    /** Returns the state representing empty mobile signal with the given number of levels. */

    public static int getEmptyState(int numLevels) {

        return getState(0, numLevels, true);

        return (STATE_EMPTY << STATE_SHIFT) | (numLevels << NUM_LEVEL_SHIFT);

    }



    /** Returns whether fullState corresponds to the empty state. */

    public static boolean isEmptyState(int fullState) {

        return getState(fullState) == STATE_EMPTY;

    }



    /** Returns the state representing carrier change with the given number of levels. */

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

+9 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.telephony.SubscriptionInfo; 
import android.util.ArraySet;

import android.util.Log;



import com.android.settingslib.graph.SignalDrawable;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.statusbar.policy.NetworkController;
@@ -186,8 +187,8 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba 


        // Visibility of the data type indicator changed

        boolean typeChanged = statusType != state.typeId && (statusType == 0 || state.typeId == 0);



        state.visible = statusIcon.visible && !mBlockMobile;

        state.visible = statusIcon.visible && !mBlockMobile

                && !isInEmptyStateOnSingleSimDevice(subId, statusIcon.icon);

        state.strengthId = statusIcon.icon;

        state.typeId = statusType;

        state.contentDescription = statusIcon.contentDescription;
@@ -209,6 +210,12 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba 
        }

    }



    private boolean isInEmptyStateOnSingleSimDevice(int subId, int icon) {

        return mMobileStates.size() == 1

                && mMobileStates.get(0).subId == subId

                && SignalDrawable.isEmptyState(icon);

    }



    private MobileIconState getState(int subId) {

        for (MobileIconState state : mMobileStates) {

            if (state.subId == subId) {