Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set the hover state to the same as focus state in RippleDrawable." into nyc-dev

Browse Source
This commit is contained in:
George Mount
2016-02-16 15:19:03 +00:00
committed by Android (Google) Code Review
parent 5393a6605f e4f976dc3b
commit d86d3fd768
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/java/android/graphics/drawable/RippleDrawable.java
View File

@@ -251,6 +251,7 @@ public class RippleDrawable extends LayerDrawable {
boolean enabled = false; boolean enabled = false;
boolean pressed = false; boolean pressed = false;
boolean focused = false; boolean focused = false;
boolean hovered = false;
for (int state : stateSet) { for (int state : stateSet) {
if (state == R.attr.state_enabled) { if (state == R.attr.state_enabled) {
@@ -259,11 +260,13 @@ public class RippleDrawable extends LayerDrawable {
focused = true; focused = true;
} else if (state == R.attr.state_pressed) { } else if (state == R.attr.state_pressed) {
pressed = true; pressed = true;
} else if (state == R.attr.state_hovered) {
hovered = true;
} }
} }
setRippleActive(enabled && pressed); setRippleActive(enabled && pressed);
setBackgroundActive(focused || (enabled && pressed), focused); setBackgroundActive(hovered || focused || (enabled && pressed), focused || hovered);
return changed; return changed;
} }