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

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

am 628e646e: am aa229902: Merge "Jump ripples to end when switching to a... 

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

* commit '628e646e':
  Jump ripples to end when switching to a non-hardware canvas
parents da562f3d 628e646e

graphics/java/android/graphics/drawable/Ripple.java

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ class Ripple { 
        final boolean canUseHardware = c.isHardwareAccelerated();

        if (mCanUseHardware != canUseHardware && mCanUseHardware) {

            // We've switched from hardware to non-hardware mode. Panic.

            cancelHardwareAnimations(false);

            cancelHardwareAnimations(true);

        }

        mCanUseHardware = canUseHardware;

graphics/java/android/graphics/drawable/RippleBackground.java

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ class RippleBackground { 
        final boolean canUseHardware = c.isHardwareAccelerated();

        if (mCanUseHardware != canUseHardware && mCanUseHardware) {

            // We've switched from hardware to non-hardware mode. Panic.

            cancelHardwareAnimations(false);

            cancelHardwareAnimations(true);

        }

        mCanUseHardware = canUseHardware;