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

Commit a3fe5342 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

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

am: 33d4c468

Change-Id: I3a08a12217e09c4624683747cc1af0fb45ced711
parents faf22d2c 33d4c468

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

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

        });

    }

    }





    private void animate() {

        mAnimator.cancel();

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

        mAnimator.start();

    }



    public float getReveal() {

    public float getReveal() {

        return mReveal;

        return mReveal;

    }

    }
@@ -93,8 +87,8 @@ class ImageRevealHelper { 
        if (DEBUG) {

        if (DEBUG) {

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

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

        }

        }

        mAnimator.cancel();

        mAwake = awake;

        mAwake = awake;

        mAnimator.setDuration(duration);

        if (duration == 0) {

        if (duration == 0) {

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

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

            // we don't need to do transition in these cases.

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

            mRevealListener.onRevealStateChanged();

            mRevealListener.onRevealEnd();

            mRevealListener.onRevealEnd();

        } else {

        } else {

            animate();

            mAnimator.setDuration(duration);

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

            mAnimator.start();

        }

        }

    }

    }