Merge branch 'wallpaper_fix_q' into 'v1-q'

        }

        }

        mAnimator.cancel();

        mAnimator.cancel();

        mAwake = awake;

        mAwake = awake;

        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.

            mReveal = mAwake ? MAX_REVEAL : MIN_REVEAL;

            mReveal = mAwake ? MAX_REVEAL : MIN_REVEAL;

            mRevealListener.onRevealStart(false /* animate */);

            mRevealListener.onRevealStart(false /* animate */);

            mRevealListener.onRevealStateChanged();

            mRevealListener.onRevealStateChanged();

            mRevealListener.onRevealEnd();

            mRevealListener.onRevealEnd();

        } else {

            mAnimator.setDuration(duration);

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

            mAnimator.start();

        }

    }

    }

    /**

    /**