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

Commit 2f4c5991 authored by Joshua Mokut's avatar Joshua Mokut
Browse files

Add hover effects to Dark mode and battery saver QS tiles 

Enabled ripple Drawable for dark mode and battery save QS tiles. this gives uniform hover behavior for all QS tiles.

Test: atest BatterySaverTileScreenshotTest
Fixes: 283750774
Change-Id: Iba6e6b4b96d2f91faaa8ec96607aeb77490d60bd
parent 6c1ae477

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;

        }

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt

+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)

packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java

+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

packages/SystemUI/src/com/android/systemui/qs/tiles/UiModeNightTile.java

+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();

    }