Merge "Hide the mobile slot when QSBH expands in legacy model" into sc-dev (6e776921) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+30 −7

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@ import android.content.res.Resources;
	import android.graphics.Color;		import android.graphics.Color;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.util.AttributeSet;		import android.util.AttributeSet;
			import android.util.FeatureFlagUtils;
	import android.util.Pair;		import android.util.Pair;
	import android.view.DisplayCutout;		import android.view.DisplayCutout;
	import android.view.View;		import android.view.View;
	@@ -87,13 +88,21 @@ public class QuickStatusBarHeader extends FrameLayout {
	private int mTopViewMeasureHeight;		private int mTopViewMeasureHeight;

	private final String mMobileSlotName;		private final String mMobileSlotName;
			private final String mNoCallingSlotName;
	private final String mCallStrengthSlotName;		private final String mCallStrengthSlotName;
			private final boolean mProviderModel;

	public QuickStatusBarHeader(Context context, AttributeSet attrs) {		public QuickStatusBarHeader(Context context, AttributeSet attrs) {
	super(context, attrs);		super(context, attrs);
	mMobileSlotName = context.getString(com.android.internal.R.string.status_bar_no_calling);		mMobileSlotName = context.getString(com.android.internal.R.string.status_bar_mobile);
			mNoCallingSlotName = context.getString(com.android.internal.R.string.status_bar_no_calling);
	mCallStrengthSlotName =		mCallStrengthSlotName =
	context.getString(com.android.internal.R.string.status_bar_call_strength);		context.getString(com.android.internal.R.string.status_bar_call_strength);
			if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
			mProviderModel = true;
			} else {
			mProviderModel = false;
			}
	}		}

	/**		/**
	@@ -242,14 +251,24 @@ public class QuickStatusBarHeader extends FrameLayout {
	.setListener(new TouchAnimator.ListenerAdapter() {		.setListener(new TouchAnimator.ListenerAdapter() {
	@Override		@Override
	public void onAnimationAtEnd() {		public void onAnimationAtEnd() {
	mIconContainer.addIgnoredSlot(mMobileSlotName);		// TODO(b/185580157): Remove the mProviderModel if the mobile slot can be
			// hidden in Provider model.
			if (mProviderModel) {
			mIconContainer.addIgnoredSlot(mNoCallingSlotName);
	mIconContainer.addIgnoredSlot(mCallStrengthSlotName);		mIconContainer.addIgnoredSlot(mCallStrengthSlotName);
			} else {
			mIconContainer.addIgnoredSlot(mMobileSlotName);
			}
	}		}

	@Override		@Override
	public void onAnimationStarted() {		public void onAnimationStarted() {
	mIconContainer.addIgnoredSlot(mMobileSlotName);		if (mProviderModel) {
			mIconContainer.addIgnoredSlot(mNoCallingSlotName);
	mIconContainer.addIgnoredSlot(mCallStrengthSlotName);		mIconContainer.addIgnoredSlot(mCallStrengthSlotName);
			} else {
			mIconContainer.addIgnoredSlot(mMobileSlotName);
			}

	setSeparatorVisibility(false);		setSeparatorVisibility(false);
	}		}
	@@ -257,8 +276,12 @@ public class QuickStatusBarHeader extends FrameLayout {
	@Override		@Override
	public void onAnimationAtStart() {		public void onAnimationAtStart() {
	super.onAnimationAtStart();		super.onAnimationAtStart();
	mIconContainer.removeIgnoredSlot(mMobileSlotName);		if (mProviderModel) {
			mIconContainer.removeIgnoredSlot(mNoCallingSlotName);
	mIconContainer.removeIgnoredSlot(mCallStrengthSlotName);		mIconContainer.removeIgnoredSlot(mCallStrengthSlotName);
			} else {
			mIconContainer.removeIgnoredSlot(mMobileSlotName);
			}

	setSeparatorVisibility(mShowClockIconsSeparator);		setSeparatorVisibility(mShowClockIconsSeparator);
	}		}