Merge "Replace invis drawable when ConstantState null" into main (77885a70) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.UiEventLogger;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.settingslib.RestrictedLockUtilsInternal;
		import com.android.settingslib.graph.SignalDrawable;
		import com.android.systemui.Dumpable;
		import com.android.systemui.animation.ActivityTransitionAnimator;
		import com.android.systemui.animation.Expandable;
		@@ -632,12 +633,23 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy
		}

		public static class DrawableIcon extends Icon {

		protected final Drawable mDrawable;
		protected final Drawable mInvisibleDrawable;
		private static final String TAG = "QSTileImpl";

		public DrawableIcon(Drawable drawable) {
		mDrawable = drawable;
		mInvisibleDrawable = drawable.getConstantState().newDrawable();
		Drawable.ConstantState nullableConstantState = drawable.getConstantState();
		if (nullableConstantState == null) {
		if (!(drawable instanceof SignalDrawable)) {
		Log.w(TAG, "DrawableIcon: drawable has null ConstantState"
		+ " and is not a SignalDrawable");
		}
		mInvisibleDrawable = drawable;
		} else {
		mInvisibleDrawable = nullableConstantState.newDrawable();
		}
		}

		@Override

+1 −0

Original line number	Diff line number	Diff line
		@@ -201,6 +201,7 @@ constructor(
		qsTileViewModel.currentState?.let { mapState(context, it, qsTileViewModel.config) }

		override fun getInstanceId(): InstanceId = qsTileViewModel.config.instanceId

		override fun getTileLabel(): CharSequence =
		with(qsTileViewModel.config.uiConfig) {
		when (this) {