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

Commit 82aa1630 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Hide AoD wallpaper after 1min 

Hide wallpaper by cross fading back scrim. This increases
battery life since black pixels won't drain power.

Bug: 64155983
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Test: set AoD wallpaper, wait for 1 min.
Test: set AoD wallpaper, wait for 50 sec, go to pulsing, wait 10 sec.
Change-Id: Ie830c2fd20f9e60efbfd9e78f248603df07ae93c
parent 7517b5dc

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+4 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui;



import android.app.AlarmManager;

import android.content.Context;

import android.util.ArrayMap;

import android.util.Log;
@@ -92,10 +93,10 @@ public class SystemUIFactory { 


    public ScrimController createScrimController(LightBarController lightBarController,

            ScrimView scrimBehind, ScrimView scrimInFront, View headsUpScrim,

            LockscreenWallpaper lockscreenWallpaper, Consumer<Boolean> scrimVisibleListener,

            DozeParameters dozeParameters) {

            LockscreenWallpaper lockscreenWallpaper, Consumer<Integer> scrimVisibleListener,

            DozeParameters dozeParameters, AlarmManager alarmManager) {

        return new ScrimController(lightBarController, scrimBehind, scrimInFront, headsUpScrim,

                scrimVisibleListener, dozeParameters);

                scrimVisibleListener, dozeParameters, alarmManager);

    }



    public NotificationIconAreaController createNotificationIconAreaController(Context context,

packages/SystemUI/src/com/android/systemui/doze/AlwaysOnDisplayPolicy.java

+26 −0
Original line number Diff line number Diff line
@@ -40,12 +40,16 @@ public class AlwaysOnDisplayPolicy { 
    private static final long DEFAULT_PROX_SCREEN_OFF_DELAY_MS = 10 * DateUtils.SECOND_IN_MILLIS;

    private static final long DEFAULT_PROX_COOLDOWN_TRIGGER_MS = 2 * DateUtils.SECOND_IN_MILLIS;

    private static final long DEFAULT_PROX_COOLDOWN_PERIOD_MS = 5 * DateUtils.SECOND_IN_MILLIS;

    private static final long DEFAULT_WALLPAPER_VISIBILITY_MS = 60 * DateUtils.SECOND_IN_MILLIS;

    private static final long DEFAULT_WALLPAPER_FADE_OUT_MS = 400;



    static final String KEY_SCREEN_BRIGHTNESS_ARRAY = "screen_brightness_array";

    static final String KEY_DIMMING_SCRIM_ARRAY = "dimming_scrim_array";

    static final String KEY_PROX_SCREEN_OFF_DELAY_MS = "prox_screen_off_delay";

    static final String KEY_PROX_COOLDOWN_TRIGGER_MS = "prox_cooldown_trigger";

    static final String KEY_PROX_COOLDOWN_PERIOD_MS = "prox_cooldown_period";

    static final String KEY_WALLPAPER_VISIBILITY_MS = "wallpaper_visibility_timeout";

    static final String KEY_WALLPAPER_FADE_OUT_MS = "wallpaper_fade_out_duration";



    /**

     * Integer array to map ambient brightness type to real screen brightness.
@@ -89,6 +93,24 @@ public class AlwaysOnDisplayPolicy { 
     */

    public long proxCooldownPeriodMs;



    /**

     * For how long(ms) the wallpaper should still be visible

     * after entering AoD.

     *

     * @see Settings.Global#ALWAYS_ON_DISPLAY_CONSTANTS

     * @see #KEY_WALLPAPER_VISIBILITY_MS

     */

    public long wallpaperVisibilityDuration;



    /**

     * Duration(ms) of the fade out animation after

     * {@link #KEY_WALLPAPER_VISIBILITY_MS} elapses.

     *

     * @see Settings.Global#ALWAYS_ON_DISPLAY_CONSTANTS

     * @see #KEY_WALLPAPER_FADE_OUT_MS

     */

    public long wallpaperFadeOutDuration;



    private final KeyValueListParser mParser;

    private final Context mContext;

    private SettingsObserver mSettingsObserver;
@@ -138,6 +160,10 @@ public class AlwaysOnDisplayPolicy { 
                        DEFAULT_PROX_COOLDOWN_TRIGGER_MS);

                proxCooldownPeriodMs = mParser.getLong(KEY_PROX_COOLDOWN_PERIOD_MS,

                        DEFAULT_PROX_COOLDOWN_PERIOD_MS);

                wallpaperFadeOutDuration = mParser.getLong(KEY_WALLPAPER_FADE_OUT_MS,

                        DEFAULT_WALLPAPER_FADE_OUT_MS);

                wallpaperVisibilityDuration = mParser.getLong(KEY_WALLPAPER_VISIBILITY_MS,

                        DEFAULT_WALLPAPER_VISIBILITY_MS);

                screenBrightnessArray = mParser.getIntArray(KEY_SCREEN_BRIGHTNESS_ARRAY,

                        resources.getIntArray(

                                R.array.config_doze_brightness_sensor_to_brightness));

packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java

+19 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.util.SparseBooleanArray; 


import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.systemui.R;

import com.android.systemui.doze.AlwaysOnDisplayPolicy;



import java.io.PrintWriter;
@@ -37,10 +38,12 @@ public class DozeParameters { 
    private final AmbientDisplayConfiguration mAmbientDisplayConfiguration;



    private static IntInOutMatcher sPickupSubtypePerformsProxMatcher;

    private final AlwaysOnDisplayPolicy mAlwaysOnPolicy;



    public DozeParameters(Context context) {

        mContext = context;

        mAmbientDisplayConfiguration = new AmbientDisplayConfiguration(mContext);

        mAlwaysOnPolicy = new AlwaysOnDisplayPolicy(context);

    }



    public void dump(PrintWriter pw) {
@@ -120,6 +123,22 @@ public class DozeParameters { 
        return getInt("doze.pickup.vibration.threshold", R.integer.doze_pickup_vibration_threshold);

    }



    /**

     * For how long a wallpaper can be visible in AoD before it fades aways.

     * @return duration in millis.

     */

    public long getWallpaperAodDuration() {

        return mAlwaysOnPolicy.wallpaperVisibilityDuration;

    }



    /**

     * How long it takes for the wallpaper fade away (Animation duration.)

     * @return duration in millis.

     */

    public long getWallpaperFadeOutDuration() {

        return mAlwaysOnPolicy.wallpaperFadeOutDuration;

    }



    /**

     * Checks if always on is available and enabled for the current user.

     * @return {@code true} if enabled and available.

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java

+83 −16
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.animation.Animator; 
import android.animation.AnimatorListenerAdapter;

import android.animation.PropertyValuesHolder;

import android.animation.ValueAnimator;

import android.app.AlarmManager;

import android.app.WallpaperManager;

import android.content.Context;

import android.graphics.Color;
@@ -51,6 +52,7 @@ import com.android.systemui.statusbar.NotificationData; 
import com.android.systemui.statusbar.ScrimView;

import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener;

import com.android.systemui.statusbar.stack.ViewState;

import com.android.systemui.util.AlarmTimeout;

import com.android.systemui.util.wakelock.DelayedWakeLock;

import com.android.systemui.util.wakelock.WakeLock;
@@ -73,6 +75,19 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
            = new PathInterpolator(0f, 0, 0.7f, 1f);

    public static final Interpolator KEYGUARD_FADE_OUT_INTERPOLATOR_LOCKED

            = new PathInterpolator(0.3f, 0f, 0.8f, 1f);



    /**

     * When both scrims have 0 alpha.

     */

    public static final int VISIBILITY_FULLY_TRANSPARENT = 0;

    /**

     * When scrims aren't transparent (alpha 0) but also not opaque (alpha 1.)

     */

    public static final int VISIBILITY_SEMI_TRANSPARENT = 1;

    /**

     * When at least 1 scrim is fully opaque (alpha set to 1.)

     */

    public static final int VISIBILITY_FULLY_OPAQUE = 2;

    /**

     * Default alpha value for most scrims.

     */
@@ -111,6 +126,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
    private final UnlockMethodCache mUnlockMethodCache;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private final DozeParameters mDozeParameters;

    private final AlarmTimeout mTimeTicker;



    private final SysuiColorExtractor mColorExtractor;

    private GradientColors mLockColors;
@@ -138,23 +154,25 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
    private float mCurrentBehindAlpha = NOT_INITIALIZED;

    private int mCurrentInFrontTint;

    private int mCurrentBehindTint;

    private boolean mWallpaperVisibilityTimedOut;

    private int mPinnedHeadsUpCount;

    private float mTopHeadsUpDragAmount;

    private View mDraggedHeadsUpView;

    private boolean mKeyguardFadingOutInProgress;

    private ValueAnimator mKeyguardFadeoutAnimation;

    private boolean mScrimsVisible;

    private final Consumer<Boolean> mScrimVisibleListener;

    private int mScrimsVisibility;

    private final Consumer<Integer> mScrimVisibleListener;

    private boolean mBlankScreen;

    private boolean mScreenBlankingCallbackCalled;

    private Callback mCallback;

    private boolean mWallpaperSupportsAmbientMode;



    private final WakeLock mWakeLock;

    private boolean mWakeLockHeld;



    public ScrimController(LightBarController lightBarController, ScrimView scrimBehind,

            ScrimView scrimInFront, View headsUpScrim, Consumer<Boolean> scrimVisibleListener,

            DozeParameters dozeParameters) {

            ScrimView scrimInFront, View headsUpScrim, Consumer<Integer> scrimVisibleListener,

            DozeParameters dozeParameters, AlarmManager alarmManager) {

        mScrimBehind = scrimBehind;

        mScrimInFront = scrimInFront;

        mHeadsUpScrim = headsUpScrim;
@@ -164,6 +182,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
        mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(mContext);

        mLightBarController = lightBarController;

        mScrimBehindAlphaResValue = mContext.getResources().getFloat(R.dimen.scrim_behind_alpha);

        mTimeTicker = new AlarmTimeout(alarmManager, this::onHideWallpaperTimeout,

                "hide_aod_wallpaper", new Handler());

        mWakeLock = createWakeLock();

        // Scrim alpha is initially set to the value on the resource but might be changed

        // to make sure that text on top of it is legible.
@@ -236,13 +256,18 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
        }



        // Do not let the device sleep until we're done with all animations

        if (!mWakeLockHeld) {

            if (mWakeLock != null) {

                mWakeLockHeld = true;

                mWakeLock.acquire();

            } else {

                Log.w(TAG, "Cannot hold wake lock, it has not been set yet");

        holdWakeLock();



        // AOD wallpapers should fade away after a while

        if (mWallpaperSupportsAmbientMode && mDozeParameters.getAlwaysOn()

                && (mState == ScrimState.AOD || mState == ScrimState.PULSING)) {

            if (!mWallpaperVisibilityTimedOut) {

                mTimeTicker.schedule(mDozeParameters.getWallpaperAodDuration(),

                        AlarmTimeout.MODE_IGNORE_IF_SCHEDULED);

            }

        } else {

            mTimeTicker.cancel();

            mWallpaperVisibilityTimedOut = false;

        }



        if (!mKeyguardUpdateMonitor.needsSlowUnlockTransition()) {
@@ -279,6 +304,30 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
        mTracking = false;

    }



    @VisibleForTesting

    protected void onHideWallpaperTimeout() {

        if (mState != ScrimState.AOD && mState != ScrimState.PULSING) {

            return;

        }



        holdWakeLock();

        mWallpaperVisibilityTimedOut = true;

        mAnimateChange = true;

        mAnimationDuration = mDozeParameters.getWallpaperFadeOutDuration();

        scheduleUpdate();

    }



    private void holdWakeLock() {

        if (!mWakeLockHeld) {

            if (mWakeLock != null) {

                mWakeLockHeld = true;

                mWakeLock.acquire();

            } else {

                Log.w(TAG, "Cannot hold wake lock, it has not been set yet");

            }

        }

    }



    /**

     * Current state of the shade expansion when pulling it from the top.

     * This value is 1 when on top of the keyguard and goes to 0 as the user drags up.
@@ -391,6 +440,14 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
            mLightBarController.setScrimColor(mScrimInFront.getColors());

        }



        // We want to override the back scrim opacity for AOD and PULSING

        // when it's time to fade the wallpaper away.

        boolean overrideBackScrimAlpha = (mState == ScrimState.PULSING || mState == ScrimState.AOD)

                && mWallpaperVisibilityTimedOut;

        if (overrideBackScrimAlpha) {

            mCurrentBehindAlpha = 1;

        }



        setScrimInFrontAlpha(mCurrentInFrontAlpha);

        setScrimBehindAlpha(mCurrentBehindAlpha);
@@ -398,12 +455,18 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
    }



    private void dispatchScrimsVisible() {

        boolean scrimsVisible = mScrimBehind.getViewAlpha() > 0 || mScrimInFront.getViewAlpha() > 0;



        if (mScrimsVisible != scrimsVisible) {

            mScrimsVisible = scrimsVisible;

        final int currentScrimVisibility;

        if (mScrimInFront.getViewAlpha() == 1 || mScrimBehind.getViewAlpha() == 1) {

            currentScrimVisibility = VISIBILITY_FULLY_OPAQUE;

        } else if (mScrimInFront.getViewAlpha() == 0 && mScrimBehind.getViewAlpha() == 0) {

            currentScrimVisibility = VISIBILITY_FULLY_TRANSPARENT;

        } else {

            currentScrimVisibility = VISIBILITY_SEMI_TRANSPARENT;

        }



            mScrimVisibleListener.accept(scrimsVisible);

        if (mScrimsVisibility != currentScrimVisibility) {

            mScrimsVisibility = currentScrimVisibility;

            mScrimVisibleListener.accept(currentScrimVisibility);

        }

    }
@@ -812,7 +875,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
    }



    public void setWallpaperSupportsAmbientMode(boolean wallpaperSupportsAmbientMode) {

        ScrimState.AOD.setWallpaperSupportsAmbientMode(wallpaperSupportsAmbientMode);

        mWallpaperSupportsAmbientMode = wallpaperSupportsAmbientMode;

        ScrimState[] states = ScrimState.values();

        for (int i = 0; i < states.length; i++) {

            states[i].setWallpaperSupportsAmbientMode(wallpaperSupportsAmbientMode);

        }

    }



    public interface Callback {

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java

+5 −11
Original line number Diff line number Diff line
@@ -19,9 +19,7 @@ package com.android.systemui.statusbar.phone; 
import android.graphics.Color;

import android.os.Trace;



import com.android.internal.annotations.VisibleForTesting;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitorCallback;

import com.android.systemui.statusbar.ScrimView;

import com.android.systemui.statusbar.stack.StackStateAnimator;
@@ -86,20 +84,14 @@ public enum ScrimState { 
     * Always on display or screen off.

     */

    AOD {

        @Override

        public void init(ScrimView scrimInFront, ScrimView scrimBehind,

                DozeParameters dozeParameters) {

            super.init(scrimInFront, scrimBehind, dozeParameters);

            mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(scrimInFront.getContext());

        }



        @Override

        public void prepare(ScrimState previousState) {

            if (previousState == ScrimState.PULSING && !mCanControlScreenOff) {

                updateScrimColor(mScrimInFront, 1, Color.BLACK);

            }

            final boolean alwaysOnEnabled = mDozeParameters.getAlwaysOn();

            mBlankScreen = previousState == ScrimState.PULSING;

            final boolean wasPulsing = previousState == ScrimState.PULSING;

            mBlankScreen = wasPulsing && !mCanControlScreenOff;

            mCurrentBehindAlpha = mWallpaperSupportsAmbientMode

                    && !mKeyguardUpdateMonitor.hasLockscreenWallpaper() ? 0f : 1f;

            mCurrentInFrontAlpha = alwaysOnEnabled ? mAodFrontScrimAlpha : 1f;
@@ -117,9 +109,10 @@ public enum ScrimState { 
    PULSING {

        @Override

        public void prepare(ScrimState previousState) {

            mCurrentBehindAlpha = 1;

            mCurrentInFrontAlpha = 0;

            mCurrentInFrontTint = Color.BLACK;

            mCurrentBehindAlpha = mWallpaperSupportsAmbientMode

                    && !mKeyguardUpdateMonitor.hasLockscreenWallpaper() ? 0f : 1f;

            mCurrentBehindTint = Color.BLACK;

            mBlankScreen = mDisplayRequiresBlanking;

            if (mDisplayRequiresBlanking) {
@@ -178,6 +171,7 @@ public enum ScrimState { 
        mDozeParameters = dozeParameters;

        mDisplayRequiresBlanking = dozeParameters.getDisplayNeedsBlanking();

        mCanControlScreenOff = dozeParameters.getCanControlScreenOffAnimation();

        mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(scrimInFront.getContext());

    }



    public void prepare(ScrimState previousState) {