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

Commit 1bc83bd2 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 68bb1bfc: am 4f048817: Merge "Don\'t make ripples respond to selection state" into lmp-dev 

* commit '68bb1bfcd9ae87db421d50d66f6125ca8e1d199d':
  Don't make ripples respond to selection state
parents 8afa5420 ad43b045

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