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

Commit 0df0e19f authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Don't make ripples respond to selection state" into lmp-dev

parents 752217bf dbcbca44

core/java/android/view/View.java

+1 −0
Original line number Diff line number Diff line
@@ -6901,6 +6901,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     *

     * @return true if the view is currently pressed, false otherwise

     */

    @ViewDebug.ExportedProperty

    public boolean isPressed() {

        return (mPrivateFlags & PFLAG_PRESSED) == PFLAG_PRESSED;

    }

graphics/java/android/graphics/drawable/RippleDrawable.java

+1 −2
Original line number Diff line number Diff line
@@ -225,8 +225,7 @@ public class RippleDrawable extends LayerDrawable { 
            if (stateSet[i] == R.attr.state_enabled) {

                enabled = true;

            }

            if (stateSet[i] == R.attr.state_focused

                    || stateSet[i] == R.attr.state_selected) {

            if (stateSet[i] == R.attr.state_focused) {

                focused = true;

            }

            if (stateSet[i] == R.attr.state_pressed) {