diff options
| author | Alan Viverette <alanv@google.com> | 2014-08-08 12:23:41 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-08-08 12:23:41 -0700 |
| commit | dbcbca447564245921697c6965b77d69cb1e795f (patch) | |
| tree | 5838b6f9e59c169359212713da81812f46d18c0f | |
| parent | d18a1da18d1f92acc2669f936da00cd66657e44b (diff) | |
| download | frameworks_base-dbcbca447564245921697c6965b77d69cb1e795f.zip frameworks_base-dbcbca447564245921697c6965b77d69cb1e795f.tar.gz frameworks_base-dbcbca447564245921697c6965b77d69cb1e795f.tar.bz2 | |
Don't make ripples respond to selection state
Also exports view pressed state for hierarchyviewer.
BUG: 16622634
Change-Id: I754428dd1d59f3b7450b01976a73d5151d27152e
| -rw-r--r-- | core/java/android/view/View.java | 1 | ||||
| -rw-r--r-- | graphics/java/android/graphics/drawable/RippleDrawable.java | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 8c2048d..e585807 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -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; } diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java index cf675ed..f097239 100644 --- a/graphics/java/android/graphics/drawable/RippleDrawable.java +++ b/graphics/java/android/graphics/drawable/RippleDrawable.java @@ -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) { |