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

Commit fda7718b authored by Mike Schneider's avatar Mike Schneider Committed by Automerger Merge Worker
Browse files

Merge "Fade out navbar on lockscreen -> homescreen transition" into tm-qpr-dev... 

Merge "Fade out navbar on lockscreen -> homescreen transition" into tm-qpr-dev am: 9bde3aa5 am: 8a70de06

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22428586



Change-Id: I8edae2669819d5897886d2bb19fa61428c2af472
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aab81829 8a70de06

packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java

+6 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ public class QuickStepContract { 
    public static final int SYSUI_STATE_WAKEFULNESS_TRANSITION = 1 << 29;

    // The notification panel expansion fraction is > 0

    public static final int SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE = 1 << 30;

    // When keyguard will be dismissed but didn't start animation yet

    public static final int SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY = 1 << 31;



    // Mask for SystemUiStateFlags to isolate SYSUI_STATE_AWAKE and

    // SYSUI_STATE_WAKEFULNESS_TRANSITION, to match WAKEFULNESS_* constants
@@ -172,6 +174,7 @@ public class QuickStepContract { 
            SYSUI_STATE_AWAKE,

            SYSUI_STATE_WAKEFULNESS_TRANSITION,

            SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE,

            SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY,

    })

    public @interface SystemUiStateFlags {}
@@ -270,6 +273,9 @@ public class QuickStepContract { 
        if ((flags & SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE) != 0) {

            str.add("notif_visible");

        }

        if ((flags & SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY) != 0) {

            str.add("keygrd_going_away");

        }



        return str.toString();

    }

packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java

+2 −2
Original line number Diff line number Diff line
@@ -210,8 +210,8 @@ public class SystemActions implements CoreStartable { 
        // Saving in instance variable since to prevent GC since

        // NotificationShadeWindowController.registerCallback() only keeps weak references.

        mNotificationShadeCallback =

                (keyguardShowing, keyguardOccluded, bouncerShowing, mDozing, panelExpanded,

                            isDreaming) ->

                (keyguardShowing, keyguardOccluded, keyguardGoingAway, bouncerShowing, mDozing,

                        panelExpanded, isDreaming) ->

                        registerOrUnregisterDismissNotificationShadeAction();

        mCentralSurfacesOptionalLazy = centralSurfacesOptionalLazy;

    }

packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java

+5 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A 
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DOZING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
@@ -676,11 +677,14 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
    }



    private void onStatusBarStateChanged(boolean keyguardShowing, boolean keyguardOccluded,

            boolean bouncerShowing, boolean isDozing, boolean panelExpanded, boolean isDreaming) {

            boolean keyguardGoingAway, boolean bouncerShowing, boolean isDozing,

            boolean panelExpanded, boolean isDreaming) {

        mSysUiState.setFlag(SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING,

                        keyguardShowing && !keyguardOccluded)

                .setFlag(SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED,

                        keyguardShowing && keyguardOccluded)

                .setFlag(SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY,

                        keyguardGoingAway)

                .setFlag(SYSUI_STATE_BOUNCER_SHOWING, bouncerShowing)

                .setFlag(SYSUI_STATE_DEVICE_DOZING, isDozing)

                .setFlag(SYSUI_STATE_DEVICE_DREAMING, isDreaming)

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -561,6 +561,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
        for (StatusBarWindowCallback cb : activeCallbacks) {

            cb.onStateChanged(mCurrentState.keyguardShowing,

                    mCurrentState.keyguardOccluded,

                    mCurrentState.keyguardGoingAway,

                    mCurrentState.bouncerShowing,

                    mCurrentState.dozing,

                    mCurrentState.panelExpanded,

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

+8 −2
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 
package com.android.systemui.statusbar.phone;



public interface StatusBarWindowCallback {

    void onStateChanged(boolean keyguardShowing, boolean keyguardOccluded, boolean bouncerShowing,

            boolean isDozing, boolean panelExpanded, boolean isDreaming);

    /**

     * Invoked when the internal state of NotificationShadeWindowControllerImpl changes.

     * Some of the flags passed as argument to the callback might have changed, but this is not

     * guaranteed.

     */

    void onStateChanged(boolean keyguardShowing, boolean keyguardOccluded,

            boolean keyguardGoingAway, boolean bouncerShowing, boolean isDozing,

            boolean panelExpanded, boolean isDreaming);

}