Merge "Revert "For 1 sim devices, hide signal empty state"" into qt-r1-dev (94531071) · Commits · e / os / android_frameworks_base

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

+4 −11

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ 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;

		@@ -204,7 +203,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) \|\| isInState(STATE_EMPTY)) {
		} else if (isInState(STATE_CUT)) {
		float cut = (CUT_OUT * width);
		mCutoutPath.moveTo(width - padding, height - padding);
		mCutoutPath.rLineTo(-cut, 0);
		@@ -269,14 +268,13 @@ public class SignalDrawable extends DrawableWrapper {
		/**
		* Returns whether this drawable is in the specified state.
		*
		* @param state must be one of {@link #STATE_CARRIER_CHANGE}, {@link #STATE_CUT},
		* or {@link #STATE_EMPTY}.
		* @param state must be one of {@link #STATE_CARRIER_CHANGE} or {@link #STATE_CUT}
		*/
		private boolean isInState(int state) {
		return getState(getLevel()) == state;
		}

		private static int getState(int fullState) {
		public static int getState(int fullState) {
		return (fullState & STATE_MASK) >> STATE_SHIFT;
		}

		@@ -288,12 +286,7 @@ 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 (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;
		return getState(0, numLevels, true);
		}

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

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

+2 −9

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ 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;
		@@ -187,8 +186,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
		&& !isInEmptyStateOnSingleSimDevice(subId, statusIcon.icon);

		state.visible = statusIcon.visible && !mBlockMobile;
		state.strengthId = statusIcon.icon;
		state.typeId = statusType;
		state.contentDescription = statusIcon.contentDescription;
		@@ -210,12 +209,6 @@ 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) {