Merge "Don't resize & dim system status icons, only notifications." (35e8eda7) · Commits · e / os / android_frameworks_base

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

+16 −7

Original line number	Diff line number	Diff line
		@@ -59,6 +59,9 @@ public class StatusBarIconView extends AnimatedImageView {
		mNotification = notification;
		setContentDescription(notification);

		// We do not resize and scale system icons (on the right), only notification icons (on the
		// left).
		if (notification != null) {
		final int outerBounds = res.getDimensionPixelSize(R.dimen.status_bar_icon_size);
		final int imageBounds = res.getDimensionPixelSize(R.dimen.status_bar_icon_drawing_size);
		final float scale = (float)imageBounds / (float)outerBounds;
		@@ -67,6 +70,7 @@ public class StatusBarIconView extends AnimatedImageView {
		final float alpha = res.getFraction(R.dimen.status_bar_icon_drawing_alpha, 1, 1);
		setAlpha(alpha);
		}
		}

		private static boolean streq(String a, String b) {
		if (a == b) {
		@@ -247,4 +251,9 @@ public class StatusBarIconView extends AnimatedImageView {
		}
		}
		}

		public String toString() {
		return "StatusBarIconView(slot=" + mSlot + " icon=" + mIcon
		+ " notification=" + mNotification + ")";
		}
		}

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

+20 −17

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ public class PhoneStatusBar extends StatusBar {
		static final String TAG = "PhoneStatusBar";
		public static final boolean DEBUG = false;
		public static final boolean SPEW = false;
		public static final boolean DUMPTRUCK = true; // extra dumpsys info

		// additional instrumentation for testing purposes; intended to be left on during development
		public static final boolean CHATTY = DEBUG \|\| true;
		@@ -1699,26 +1700,28 @@ public class PhoneStatusBar extends StatusBar {
		pw.println(" mScrollView: " + viewInfo(mScrollView)
		+ " scroll " + mScrollView.getScrollX() + "," + mScrollView.getScrollY());
		}
		/*

		if (DUMPTRUCK) {
		synchronized (mNotificationData) {
		int N = mNotificationData.ongoingCount();
		pw.println(" ongoingCount.size=" + N);
		int N = mNotificationData.size();
		pw.println(" notification icons: " + N);
		for (int i=0; i<N; i++) {
		StatusBarNotification n = mNotificationData.getOngoing(i);
		pw.println(" [" + i + "] key=" + n.key + " view=" + n.view);
		pw.println(" data=" + n.data);
		NotificationData.Entry e = mNotificationData.get(i);
		pw.println(" [" + i + "] key=" + e.key + " icon=" + e.icon);
		StatusBarNotification n = e.notification;
		pw.println(" pkg=" + n.pkg + " id=" + n.id + " priority=" + n.priority);
		pw.println(" notification=" + n.notification);
		pw.println(" tickerText=\"" + n.notification.tickerText + "\"");
		}
		N = mNotificationData.latestCount();
		pw.println(" ongoingCount.size=" + N);
		for (int i=0; i<N; i++) {
		StatusBarNotification n = mNotificationData.getLatest(i);
		pw.println(" [" + i + "] key=" + n.key + " view=" + n.view);
		pw.println(" data=" + n.data);
		}

		int N = mStatusIcons.getChildCount();
		pw.println(" system icons: " + N);
		for (int i=0; i<N; i++) {
		StatusBarIconView ic = (StatusBarIconView) mStatusIcons.getChildAt(i);
		pw.println(" [" + i + "] icon=" + ic);
		}
		*/

		if (false) {
		pw.println("see the logcat for a dump of the views we have created.");
		// must happen on ui thread
		mHandler.post(new Runnable() {