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

am aa229902: Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev

Browse Source 
* commit 'aa229902ef73f8777768414092eaf99eeff05f87':
  Jump ripples to end when switching to a non-hardware canvas
This commit is contained in:
Alan Viverette
2015-01-15 01:11:41 +00:00
committed by Android Git Automerger
parent cf1950aaab aa229902ef
commit 628e646eea
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/java/android/graphics/drawable/Ripple.java
View File

@@ -214,7 +214,7 @@ class Ripple {
final boolean canUseHardware = c.isHardwareAccelerated(); final boolean canUseHardware = c.isHardwareAccelerated();
if (mCanUseHardware != canUseHardware && mCanUseHardware) { if (mCanUseHardware != canUseHardware && mCanUseHardware) {
// We've switched from hardware to non-hardware mode. Panic. // We've switched from hardware to non-hardware mode. Panic.
cancelHardwareAnimations(false); cancelHardwareAnimations(true);
} }
mCanUseHardware = canUseHardware; mCanUseHardware = canUseHardware;

2
graphics/java/android/graphics/drawable/RippleBackground.java
View File

@@ -148,7 +148,7 @@ class RippleBackground {
final boolean canUseHardware = c.isHardwareAccelerated(); final boolean canUseHardware = c.isHardwareAccelerated();
if (mCanUseHardware != canUseHardware && mCanUseHardware) { if (mCanUseHardware != canUseHardware && mCanUseHardware) {
// We've switched from hardware to non-hardware mode. Panic. // We've switched from hardware to non-hardware mode. Panic.
cancelHardwareAnimations(false); cancelHardwareAnimations(true);
} }
mCanUseHardware = canUseHardware; mCanUseHardware = canUseHardware;