Merge "Add hover effects to Dark mode and battery saver QS tiles" into udc-qpr-dev (5462c4f9) · Commits · e / os / android_frameworks_base

packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -172,7 +172,6 @@ public interface QSTile {
		public String expandedAccessibilityClassName;
		public SlashState slash;
		public boolean handlesLongClick = true;
		public boolean showRippleEffect = true;
		@Nullable
		public Drawable sideViewCustomDrawable;
		public String spec;
		@@ -217,7 +216,6 @@ public interface QSTile {
		\|\| !Objects.equals(other.dualTarget, dualTarget)
		\|\| !Objects.equals(other.slash, slash)
		\|\| !Objects.equals(other.handlesLongClick, handlesLongClick)
		\|\| !Objects.equals(other.showRippleEffect, showRippleEffect)
		\|\| !Objects.equals(other.sideViewCustomDrawable, sideViewCustomDrawable);
		other.spec = spec;
		other.icon = icon;
		@@ -234,7 +232,6 @@ public interface QSTile {
		other.isTransient = isTransient;
		other.slash = slash != null ? slash.copy() : null;
		other.handlesLongClick = handlesLongClick;
		other.showRippleEffect = showRippleEffect;
		other.sideViewCustomDrawable = sideViewCustomDrawable;
		return changed;
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -116,6 +116,10 @@ open class QSTileViewImpl @JvmOverloads constructor(
		private lateinit var customDrawableView: ImageView
		private lateinit var chevronView: ImageView
		private var mQsLogger: QSLogger? = null

		/**
		* Controls if tile background is set to a [RippleDrawable] see [setClickable]
		*/
		protected var showRippleEffect = true

		private lateinit var ripple: RippleDrawable
		@@ -440,7 +444,6 @@ open class QSTileViewImpl @JvmOverloads constructor(

		protected open fun handleStateChanged(state: QSTile.State) {
		val allowAnimations = animationsEnabled()
		showRippleEffect = state.showRippleEffect
		isClickable = state.state != Tile.STATE_UNAVAILABLE
		isLongClickable = state.handlesLongClick
		icon.setIcon(state, allowAnimations)

+0 −1

Original line number	Diff line number	Diff line
		@@ -155,7 +155,6 @@ public class BatterySaverTile extends QSTileImpl<BooleanState> implements
		state.contentDescription = state.label;
		state.value = mPowerSave;
		state.expandedAccessibilityClassName = Switch.class.getName();
		state.showRippleEffect = mSetting.getValue() == 0;
		}

		@Override

+0 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,6 @@ public class UiModeNightTile extends QSTileImpl<QSTile.BooleanState> implements
		state.icon = ResourceIcon.get(state.state == Tile.STATE_ACTIVE
		? R.drawable.qs_light_dark_theme_icon_on
		: R.drawable.qs_light_dark_theme_icon_off);
		state.showRippleEffect = false;
		state.expandedAccessibilityClassName = Switch.class.getName();
		}