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

Commit 33d4c468 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix black image wallpaper issue" into qt-qpr1-dev am: 0f57fd15 

Change-Id: I01190df4e448e7125a0a5dc51822caa2b8757e08
parents 82993fd5 0f57fd15

packages/SystemUI/src/com/android/systemui/glwallpaper/ImageRevealHelper.java

+4 −8
Original line number Diff line number Diff line
@@ -81,12 +81,6 @@ class ImageRevealHelper { 
        });

    }



    private void animate() {

        mAnimator.cancel();

        mAnimator.setFloatValues(mReveal, mAwake ? MAX_REVEAL : MIN_REVEAL);

        mAnimator.start();

    }



    public float getReveal() {

        return mReveal;

    }
@@ -95,8 +89,8 @@ class ImageRevealHelper { 
        if (DEBUG) {

            Log.d(TAG, "updateAwake: awake=" + awake + ", duration=" + duration);

        }

        mAnimator.cancel();

        mAwake = awake;

        mAnimator.setDuration(duration);

        if (duration == 0) {

            // We are transiting from home to aod or aod to home directly,

            // we don't need to do transition in these cases.
@@ -105,7 +99,9 @@ class ImageRevealHelper { 
            mRevealListener.onRevealStateChanged();

            mRevealListener.onRevealEnd();

        } else {

            animate();

            mAnimator.setDuration(duration);

            mAnimator.setFloatValues(mReveal, mAwake ? MAX_REVEAL : MIN_REVEAL);

            mAnimator.start();

        }

    }