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

Commit 8a63806a authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Revert "Add massive logging to investigate blank Keyguard" 

This reverts commit 10ead64346b2651be144ac591117cc2413d8caa3.

Bug: 17475334
Change-Id: Ie7103a2ede1f00a91a2afc51d9e6ecf5ae569545
parent 51a400eb

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

+0 −12
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ import com.android.systemui.SwipeHelper; 
import com.android.systemui.SystemUI;

import com.android.systemui.statusbar.NotificationData.Entry;

import com.android.systemui.statusbar.phone.KeyguardTouchDelegate;

import com.android.systemui.statusbar.phone.PhoneStatusBar;

import com.android.systemui.statusbar.phone.NavigationBarView;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.policy.HeadsUpNotificationView;
@@ -293,10 +292,6 @@ public abstract class BaseStatusBar extends SystemUI implements 


                        // close the shade if it was open

                        if (handled) {

                            if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                                Log.i(TAG, "Collapsing panel from mOnClickHandler after keyguard"

                                        + "dismiss");

                            }

                            animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);

                            visibilityChanged(false);

                        }
@@ -343,9 +338,6 @@ public abstract class BaseStatusBar extends SystemUI implements 
                Settings.Secure.putInt(mContext.getContentResolver(),

                        Settings.Secure.SHOW_NOTE_ABOUT_NOTIFICATION_HIDING, 0);

                if (BANNER_ACTION_SETUP.equals(action)) {

                    if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                        Log.i(TAG, "Animating collapse because of BANNER_ACTION_SETUP");

                    }

                    animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);

                    mContext.startActivity(new Intent(Settings.ACTION_APP_NOTIFICATION_REDACTION)

                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -771,10 +763,6 @@ public abstract class BaseStatusBar extends SystemUI implements 
                        }

                    }

                });

                if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                    Log.i(TAG, "Collapsing panel from startNotificationGutsIntent after keyguard"

                            + "dismiss");

                }

                animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);

                return true;

            }

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

+0 −3
Original line number Diff line number Diff line
@@ -132,9 +132,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        public boolean performAccessibilityAction(View host, int action, Bundle args) {

            if (action == ACTION_CLICK) {

                if (host == mLockIcon) {

                    if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                        Log.i(TAG, "Collapsing panel from lock icon accessibility click");

                    }

                    mPhoneStatusBar.animateCollapsePanels(

                            CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);

                    return true;

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

+0 −9
Original line number Diff line number Diff line
@@ -140,9 +140,6 @@ public class PanelBar extends FrameLayout { 
        mPanelHolder.setSelectedPanel(mTouchingPanel);

        for (PanelView pv : mPanels) {

            if (pv != panel) {

                if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                    Log.i(TAG, "Collapsing because opening another panel");

                }

                pv.collapse(false /* delayed */);

            }

        }
@@ -194,15 +191,9 @@ public class PanelBar extends FrameLayout { 
        boolean waiting = false;

        for (PanelView pv : mPanels) {

            if (animate && !pv.isFullyCollapsed()) {

                if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                    Log.i(TAG, "Animating collapse, delayed");

                }

                pv.collapse(true /* delayed */);

                waiting = true;

            } else {

                if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                    Log.i(TAG, "Collapsing without animation");

                }

                pv.resetViews();

                pv.setExpandedFraction(0); // just in case

                pv.setVisibility(View.GONE);

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

+0 −40
Original line number Diff line number Diff line
@@ -136,9 +136,6 @@ public abstract class PanelView extends FrameLayout { 
    }



    private void runPeekAnimation() {

        if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

            Log.i(TAG, "Starting peek animation");

        }

        mPeekHeight = getPeekHeight();

        if (DEBUG) logf("peek to height=%.1f", mPeekHeight);

        if (mHeightAnimator != null) {
@@ -159,15 +156,9 @@ public abstract class PanelView extends FrameLayout { 
            public void onAnimationEnd(Animator animation) {

                mPeekAnimator = null;

                if (mCollapseAfterPeek && !mCancelled) {

                    if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                        Log.i(TAG, "Peek animation finished, posting collapse");

                    }

                    postOnAnimation(new Runnable() {

                        @Override

                        public void run() {

                            if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                                Log.i(TAG, "Peek animation finished, collapsing");

                            }

                            collapse(false /* delayed */);

                        }

                    });
@@ -345,9 +336,6 @@ public abstract class PanelView extends FrameLayout { 
                    }

                    boolean expand = flingExpands(vel, vectorVel);

                    onTrackingStopped(expand);

                    if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                        Log.i(TAG, "Flinging: expand=" + expand);

                    }

                    DozeLog.traceFling(expand, mTouchAboveFalsingThreshold,

                            mStatusBar.isFalsingThresholdNeeded());

                    fling(vel, expand);
@@ -535,9 +523,6 @@ public abstract class PanelView extends FrameLayout { 
            notifyExpandingFinished();

            return;

        }

        if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

            Log.i(TAG, "Executing fling: expand=" + expand + " vel=" + vel);

        }

        mOverExpandedBeforeFling = getOverExpansionAmount() > 0f;

        ValueAnimator animator = createHeightAnimator(target);

        if (expand) {
@@ -719,14 +704,8 @@ public abstract class PanelView extends FrameLayout { 
            mClosing = true;

            notifyExpandingStarted();

            if (delayed) {

                if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                    Log.i(TAG, "Posting collapse runnable, will be run in 120ms");

                }

                postDelayed(mFlingCollapseRunnable, 120);

            } else {

                if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                    Log.i(TAG, "Animating collapsing now");

                }

                fling(0, false /* expand */);

            }

        }
@@ -735,9 +714,6 @@ public abstract class PanelView extends FrameLayout { 
    private final Runnable mFlingCollapseRunnable = new Runnable() {

        @Override

        public void run() {

            if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                Log.i(TAG, "Executing collapse runnable, animating collapsing now");

            }

            fling(0, false /* expand */);

        }

    };
@@ -766,11 +742,6 @@ public abstract class PanelView extends FrameLayout { 
    }



    public void instantExpand() {

        if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

            Log.i(TAG, "Before instant expanding"

                    + " mTracking=" + mTracking

                    + " mExpanding=" + mExpanding);

        }

        mInstantExpanding = true;

        mUpdateFlingOnLayout = false;

        abortAnimations();
@@ -791,11 +762,6 @@ public abstract class PanelView extends FrameLayout { 
                    public void onGlobalLayout() {

                        if (mStatusBar.getStatusBarWindow().getHeight()

                                != mStatusBar.getStatusBarHeight()) {

                            if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                                Log.i(TAG, "Now instant expanding after layout"

                                        + " mTracking=" + mTracking

                                        + " mExpanding=" + mExpanding);

                            }

                            getViewTreeObserver().removeOnGlobalLayoutListener(this);

                            setExpandedFraction(1f);

                            mInstantExpanding = false;
@@ -942,9 +908,6 @@ public abstract class PanelView extends FrameLayout { 
    private final Runnable mPostCollapseRunnable = new Runnable() {

        @Override

        public void run() {

            if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                Log.i(TAG, "Collapsing after middle clicked");

            }

            collapse(false /* delayed */);

        }

    };
@@ -957,9 +920,6 @@ public abstract class PanelView extends FrameLayout { 
                mStatusBar.goToKeyguard();

                return true;

            case StatusBarState.SHADE:

                if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                    Log.i(TAG, "Middle clicked in shade state, posting collapsing runnable");

                }



                // This gets called in the middle of the touch handling, where the state is still

                // that we are tracking the panel. Collapse the panel after this is done.

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

+0 −22
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    public static final boolean DEBUG_GESTURES = false;

    public static final boolean DEBUG_MEDIA = false;

    public static final boolean DEBUG_MEDIA_FAKE_ARTWORK = false;

    public static final boolean DEBUG_EMPTY_KEYGUARD = true;



    public static final boolean DEBUG_WINDOW_STATE = false;
@@ -2282,11 +2281,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            mStatusBarWindowManager.setStatusBarFocusable(false);



            mStatusBarWindow.cancelExpandHelper();

            if (DEBUG_EMPTY_KEYGUARD) {

                Log.i(TAG, "Collapsing panel from animateCollapsePanels:"

                        + " force=" + force

                        + " mState=" + mState);

            }

            mStatusBarView.collapseAllPanels(true);

        }

    }
@@ -2374,9 +2368,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    }



    public void animateCollapseQuickSettings() {

        if (DEBUG_EMPTY_KEYGUARD) {

            Log.i(TAG, "Collapsing panel from animateCollapseQuickSettings");

        }

        mStatusBarView.collapseAllPanels(true);

    }
@@ -2389,9 +2380,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        }



        // Ensure the panel is fully collapsed (just in case; bug 6765842, 7260868)

        if (DEBUG_EMPTY_KEYGUARD) {

            Log.i(TAG, "Collapsing panel from makeExpandedInvisible");

        }

        mStatusBarView.collapseAllPanels(/*animate=*/ false);



        // reset things to their proper state
@@ -2483,9 +2471,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            mStatusBarWindowState = state;

            if (DEBUG_WINDOW_STATE) Log.d(TAG, "Status bar " + windowStateToString(state));

            if (!showing) {

                if (DEBUG_EMPTY_KEYGUARD) {

                    Log.i(TAG, "Collapsing panel from setWindowState");

                }

                mStatusBarView.collapseAllPanels(false);

            }

        }
@@ -3045,10 +3030,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                    }

                });

                if (dismissShade) {

                    if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                        Log.i(TAG, "Collapsing panel startActivityDismissKeyguard after keyguard"

                                + "dismiss");

                    }

                    animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);

                }

                return true;
@@ -3727,9 +3708,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    public boolean onSpacePressed() {

        if (mScreenOn != null && mScreenOn

                && (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED)) {

            if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {

                Log.i(TAG, "Collapsing panel from onSpacePressed");

            }

            animateCollapsePanels(0 /* flags */, true /* force */);

            return true;

        }