Merge "Never split multiple constructors." (e2adc167) · Commits · e / os / android_frameworks_base

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -185,6 +185,16 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
		maybeUpdateIconScaleDimens();
		}

		public StatusBarIconView(Context context, AttributeSet attrs) {
		super(context, attrs);
		mDozer = new NotificationIconDozeHelper(context);
		mBlocked = false;
		mAlwaysScaleIcon = true;
		reloadDimens();
		maybeUpdateIconScaleDimens();
		mDensity = context.getResources().getDisplayMetrics().densityDpi;
		}

		/** Should always be preceded by {@link #reloadDimens()} */
		private void maybeUpdateIconScaleDimens() {
		// We do not resize and scale system icons (on the right), only notification icons (on the
		@@ -277,16 +287,6 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
		maybeUpdateIconScaleDimens();
		}

		public StatusBarIconView(Context context, AttributeSet attrs) {
		super(context, attrs);
		mDozer = new NotificationIconDozeHelper(context);
		mBlocked = false;
		mAlwaysScaleIcon = true;
		reloadDimens();
		maybeUpdateIconScaleDimens();
		mDensity = context.getResources().getDisplayMetrics().densityDpi;
		}

		private static boolean streq(String a, String b) {
		if (a == b) {
		return true;