Merge "Improve dumps for NotificationShelf views" into tm-qpr-dev (f201b1bc) · Commits · e / os / android_frameworks_base

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,17 @@ public class NotificationShelf extends ActivatableNotificationView implements
		return new ShelfState();
		}

		@Override
		public String toString() {
		return "NotificationShelf("
		+ "hideBackground=" + mHideBackground + " notGoneIndex=" + mNotGoneIndex
		+ " hasItemsInStableShelf=" + mHasItemsInStableShelf
		+ " statusBarState=" + mStatusBarState + " interactive=" + mInteractive
		+ " animationsEnabled=" + mAnimationsEnabled
		+ " showNotificationShelf=" + mShowNotificationShelf
		+ " indexOfFirstViewInShelf=" + mIndexOfFirstViewInShelf + ')';
		}

		/** Update the state of the shelf. */
		public void updateState(StackScrollAlgorithm.StackScrollAlgorithmState algorithmState,
		AmbientState ambientState) {

+5 −3

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import android.graphics.Paint;
		import android.graphics.Rect;
		import android.graphics.drawable.Drawable;
		import android.graphics.drawable.Icon;
		import android.os.Parcelable;
		import android.os.Trace;
		import android.os.UserHandle;
		import android.service.notification.StatusBarNotification;
		@@ -551,9 +550,12 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
		}
		}

		@Override
		public String toString() {
		return "StatusBarIconView(slot=" + mSlot + " icon=" + mIcon
		+ " notification=" + mNotification + ")";
		return "StatusBarIconView("
		+ "slot='" + mSlot + " alpha=" + getAlpha() + " icon=" + mIcon
		+ " iconColor=#" + Integer.toHexString(mIconColor)
		+ " notification=" + mNotification + ')';
		}

		public StatusBarNotification getNotification() {

+9 −0

Original line number	Diff line number	Diff line
		@@ -278,6 +278,15 @@ public class NotificationIconContainer extends ViewGroup {
		}
		}

		@Override
		public String toString() {
		return "NotificationIconContainer("
		+ "dozing=" + mDozing + " onLockScreen=" + mOnLockScreen
		+ " inNotificationIconShelf=" + mInNotificationIconShelf
		+ " speedBumpIndex=" + mSpeedBumpIndex
		+ " themedTextColorPrimary=#" + Integer.toHexString(mThemedTextColorPrimary) + ')';
		}

		@VisibleForTesting
		public void setIconSize(int size) {
		mIconSize = size;