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

Commit 2290e18c authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-e78f08e08e08405dbecbcc11c69b1ee2" into... 

Merge changes from topic "presubmit-am-e78f08e08e08405dbecbcc11c69b1ee2" into sc-v2-dev-plus-aosp am: 997db6cd

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

Change-Id: Ic2a4d2c03325339ea9e654b711ee8880ccaa83b5
parents e63c1ae5 997db6cd

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -518,6 +518,7 @@ public class StatusBarStateControllerImpl implements 
    }

    }





    private void recordHistoricalState(int newState, int lastState, boolean upcoming) {

    private void recordHistoricalState(int newState, int lastState, boolean upcoming) {

        Trace.traceCounter(Trace.TRACE_TAG_APP, "statusBarState", newState);

        mHistoryIndex = (mHistoryIndex + 1) % HISTORY_SIZE;

        mHistoryIndex = (mHistoryIndex + 1) % HISTORY_SIZE;

        HistoricalState state = mHistoricalRecords[mHistoryIndex];

        HistoricalState state = mHistoricalRecords[mHistoryIndex];

        state.mNewState = newState;

        state.mNewState = newState;

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -2987,6 +2987,7 @@ public class StatusBar extends CoreStartable implements 
    }

    }





    public void showKeyguardImpl() {

    public void showKeyguardImpl() {

        Trace.beginSection("StatusBar#showKeyguard");

        mIsKeyguard = true;

        mIsKeyguard = true;

        // In case we're locking while a smartspace transition is in progress, reset it.

        // In case we're locking while a smartspace transition is in progress, reset it.

        mKeyguardUnlockAnimationController.resetSmartspaceTransition();

        mKeyguardUnlockAnimationController.resetSmartspaceTransition();
@@ -3001,6 +3002,7 @@ public class StatusBar extends CoreStartable implements 
            mStatusBarStateController.setState(StatusBarState.KEYGUARD);

            mStatusBarStateController.setState(StatusBarState.KEYGUARD);

        }

        }

        updatePanelExpansionForKeyguard();

        updatePanelExpansionForKeyguard();

        Trace.endSection();

    }

    }





    private void updatePanelExpansionForKeyguard() {

    private void updatePanelExpansionForKeyguard() {

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ import android.content.res.ColorStateList; 
import android.hardware.biometrics.BiometricSourceType;

import android.hardware.biometrics.BiometricSourceType;

import android.os.Bundle;

import android.os.Bundle;

import android.os.SystemClock;

import android.os.SystemClock;

import android.os.Trace;

import android.view.KeyEvent;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.MotionEvent;

import android.view.View;

import android.view.View;
@@ -374,6 +375,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
     */

     */

    @Override

    @Override

    public void show(Bundle options) {

    public void show(Bundle options) {

        Trace.beginSection("StatusBarKeyguardViewManager#show");

        mShowing = true;

        mShowing = true;

        mNotificationShadeWindowController.setKeyguardShowing(true);

        mNotificationShadeWindowController.setKeyguardShowing(true);

        mKeyguardStateController.notifyKeyguardState(mShowing,

        mKeyguardStateController.notifyKeyguardState(mShowing,
@@ -381,6 +383,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        reset(true /* hideBouncerWhenShowing */);

        reset(true /* hideBouncerWhenShowing */);

        SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED,

        SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED,

                SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__SHOWN);

                SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__SHOWN);

        Trace.endSection();

    }

    }





    /**

    /**
@@ -715,6 +718,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 




    @Override

    @Override

    public void hide(long startTime, long fadeoutDuration) {

    public void hide(long startTime, long fadeoutDuration) {

        Trace.beginSection("StatusBarKeyguardViewManager#hide");

        mShowing = false;

        mShowing = false;

        mKeyguardStateController.notifyKeyguardState(mShowing,

        mKeyguardStateController.notifyKeyguardState(mShowing,

                mKeyguardStateController.isOccluded());

                mKeyguardStateController.isOccluded());
@@ -814,6 +818,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        }

        }

        SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED,

        SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED,

                SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__HIDDEN);

                SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__HIDDEN);

        Trace.endSection();

    }

    }





    private boolean needsBypassFading() {

    private boolean needsBypassFading() {