Merge "More debug logs for stuck statusbars." (2977a30e) · Commits · e / os / android_frameworks_base

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

+18 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.systemui.statusbar.phone;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayDeque;
		import java.util.ArrayList;
		import java.util.Iterator;
		@@ -594,4 +596,20 @@ public class PanelView extends FrameLayout {
		if (DEBUG) LOG("skipping expansion: is expanded");
		}
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println(String.format("[PanelView(%s): expandedHeight=%f fullHeight=%f closing=%s"
		+ " tracking=%s rubberbanding=%s justPeeked=%s peekAnim=%s%s timeAnim=%s%s"
		+ "]",
		this.getClass().getSimpleName(),
		getExpandedHeight(),
		getFullHeight(),
		mClosing?"T":"f",
		mTracking?"T":"f",
		mRubberbanding?"T":"f",
		mJustPeeked?"T":"f",
		mPeekAnimator, ((mPeekAnimator!=null && mPeekAnimator.isStarted())?" (started)":""),
		mTimeAnimator, ((mTimeAnimator!=null && mTimeAnimator.isStarted())?" (started)":"")
		));
		}
		}

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

+16 −26

Original line number	Diff line number	Diff line
		@@ -246,16 +246,6 @@ public class PhoneStatusBar extends BaseStatusBar {
		private ViewGroup mCling;
		private boolean mSuppressStatusBarDrags; // while a cling is up, briefly deaden the bar to give things time to settle

		boolean mAnimating;
		boolean mClosing; // only valid when mAnimating; indicates the initial acceleration
		float mAnimY;
		float mAnimVel;
		float mAnimAccel;
		long mAnimLastTimeNanos;
		boolean mAnimatingReveal = false;
		int mViewDelta;
		float mFlingVelocity;
		int mFlingY;
		int[] mAbsPos = new int[2];
		Runnable mPostCollapseCleanup = null;

		@@ -352,7 +342,7 @@ public class PhoneStatusBar extends BaseStatusBar {
		@Override
		public boolean onTouch(View v, MotionEvent event) {
		if (event.getAction() == MotionEvent.ACTION_DOWN) {
		if (mExpandedVisible && !mAnimating) {
		if (mExpandedVisible) {
		animateCollapsePanels();
		}
		}
		@@ -963,7 +953,7 @@ public class PhoneStatusBar extends BaseStatusBar {
		mHandler.sendEmptyMessage(MSG_HIDE_INTRUDER);
		}

		if (CLOSE_PANEL_WHEN_EMPTIED && mNotificationData.size() == 0 && !mAnimating) {
		if (CLOSE_PANEL_WHEN_EMPTIED && mNotificationData.size() == 0) {
		animateCollapsePanels();
		}
		}
		@@ -1411,10 +1401,6 @@ public class PhoneStatusBar extends BaseStatusBar {
		if (SPEW) {
		Slog.d(TAG, "animateCollapse():"
		+ " mExpandedVisible=" + mExpandedVisible
		+ " mAnimating=" + mAnimating
		+ " mAnimatingReveal=" + mAnimatingReveal
		+ " mAnimY=" + mAnimY
		+ " mAnimVel=" + mAnimVel
		+ " flags=" + flags);
		}

		@@ -2051,16 +2037,6 @@ public class PhoneStatusBar extends BaseStatusBar {
		+ ", mTrackingPosition=" + mTrackingPosition);
		pw.println(" mTicking=" + mTicking);
		pw.println(" mTracking=" + mTracking);
		pw.println(" mNotificationPanel=" +
		((mNotificationPanel == null)
		? "null"
		: (mNotificationPanel + " params=" + mNotificationPanel.getLayoutParams().debug(""))));
		pw.println(" mAnimating=" + mAnimating
		+ ", mAnimY=" + mAnimY + ", mAnimVel=" + mAnimVel
		+ ", mAnimAccel=" + mAnimAccel);
		pw.println(" mAnimLastTimeNanos=" + mAnimLastTimeNanos);
		pw.println(" mAnimatingReveal=" + mAnimatingReveal
		+ " mViewDelta=" + mViewDelta);
		pw.println(" mDisplayMetrics=" + mDisplayMetrics);
		pw.println(" mPile: " + viewInfo(mPile));
		pw.println(" mTickerView: " + viewInfo(mTickerView));
		@@ -2075,6 +2051,20 @@ public class PhoneStatusBar extends BaseStatusBar {
		mNavigationBarView.dump(fd, pw, args);
		}

		pw.println(" Panels: ");
		if (mNotificationPanel != null) {
		pw.println(" mNotificationPanel=" +
		mNotificationPanel + " params=" + mNotificationPanel.getLayoutParams().debug(""));
		pw.print (" ");
		mNotificationPanel.dump(fd, pw, args);
		}
		if (mSettingsPanel != null) {
		pw.println(" mSettingsPanel=" +
		mSettingsPanel + " params=" + mSettingsPanel.getLayoutParams().debug(""));
		pw.print (" ");
		mSettingsPanel.dump(fd, pw, args);
		}

		if (DUMPTRUCK) {
		synchronized (mNotificationData) {
		int N = mNotificationData.size();