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

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

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

* commit 'aa229902':
  Jump ripples to end when switching to a non-hardware canvas
parents cf1950aa aa229902

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;