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

Commit 997db6cd authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerge] Add more tracing 2p: 48309cc7
  Add more tracing
parents 932b4b91 5c838dea

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.animation.AnimatorListenerAdapter; 
import android.animation.ObjectAnimator;

import android.animation.ValueAnimator;

import android.os.SystemProperties;

import android.os.Trace;

import android.text.format.DateFormat;

import android.util.FloatProperty;

import android.util.Log;
@@ -507,6 +508,7 @@ public class StatusBarStateControllerImpl implements 
    }



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

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

        mHistoryIndex = (mHistoryIndex + 1) % HISTORY_SIZE;

        HistoricalState state = mHistoricalRecords[mHistoryIndex];

        state.mNewState = newState;

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

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



    public void showKeyguardImpl() {

        Trace.beginSection("StatusBar#showKeyguard");

        mIsKeyguard = true;

        if (mKeyguardStateController.isLaunchTransitionFadingAway()) {

            mNotificationPanelViewController.cancelAnimation();
@@ -2969,6 +2970,7 @@ public class StatusBar extends SystemUI implements 
            mStatusBarStateController.setState(StatusBarState.KEYGUARD);

        }

        updatePanelExpansionForKeyguard();

        Trace.endSection();

    }



    private void updatePanelExpansionForKeyguard() {

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

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

import android.os.Bundle;

import android.os.SystemClock;

import android.os.Trace;

import android.view.KeyEvent;

import android.view.MotionEvent;

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

    @Override

    public void show(Bundle options) {

        Trace.beginSection("StatusBarKeyguardViewManager#show");

        mShowing = true;

        mNotificationShadeWindowController.setKeyguardShowing(true);

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

        SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED,

                SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__SHOWN);

        Trace.endSection();

    }



    /**
@@ -722,6 +725,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 


    @Override

    public void hide(long startTime, long fadeoutDuration) {

        Trace.beginSection("StatusBarKeyguardViewManager#hide");

        mShowing = false;

        mKeyguardStateController.notifyKeyguardState(mShowing,

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

        SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED,

                SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__HIDDEN);

        Trace.endSection();

    }



    private boolean needsBypassFading() {