Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev (204346c2) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+0 −25

Original line number	Diff line number	Diff line
		@@ -67,7 +67,6 @@ import android.text.style.TextAppearanceSpan;
		import android.util.ArraySet;
		import android.util.Log;
		import android.util.SparseArray;
		import android.util.TypedValue;
		import android.view.Gravity;
		import android.view.NotificationHeaderView;
		import android.view.View;
		@@ -3899,7 +3898,6 @@ public class Notification implements Parcelable
		if (p.title != null) {
		contentView.setViewVisibility(R.id.title, View.VISIBLE);
		contentView.setTextViewText(R.id.title, processTextSpans(p.title));
		updateTextSizePrimary(contentView, R.id.title);
		if (!p.ambient) {
		setTextViewColorPrimary(contentView, R.id.title);
		}
		@@ -3911,7 +3909,6 @@ public class Notification implements Parcelable
		int textId = showProgress ? com.android.internal.R.id.text_line_1
		: com.android.internal.R.id.text;
		contentView.setTextViewText(textId, processTextSpans(p.text));
		updateTextSizeSecondary(contentView, textId);
		if (!p.ambient) {
		setTextViewColorSecondary(contentView, textId);
		}
		@@ -3923,25 +3920,6 @@ public class Notification implements Parcelable
		return contentView;
		}

		private void updateTextSizeSecondary(RemoteViews contentView, int textId) {
		updateTextSizeColorized(contentView, textId,
		com.android.internal.R.dimen.notification_text_size_colorized,
		com.android.internal.R.dimen.notification_text_size);
		}

		private void updateTextSizePrimary(RemoteViews contentView, int textId) {
		updateTextSizeColorized(contentView, textId,
		com.android.internal.R.dimen.notification_title_text_size_colorized,
		com.android.internal.R.dimen.notification_title_text_size);
		}

		private void updateTextSizeColorized(RemoteViews contentView, int textId,
		int colorizedDimen, int normalDimen) {
		int size = mContext.getResources().getDimensionPixelSize(isColorized()
		? colorizedDimen : normalDimen);
		contentView.setTextViewTextSize(textId, TypedValue.COMPLEX_UNIT_PX, size);
		}

		private CharSequence processTextSpans(CharSequence text) {
		if (hasForegroundColor()) {
		return NotificationColorUtil.clearColorSpans(text);
		@@ -5867,7 +5845,6 @@ public class Notification implements Parcelable
		builder.setTextViewColorSecondary(contentView, R.id.big_text);
		contentView.setViewVisibility(R.id.big_text,
		TextUtils.isEmpty(bigTextText) ? View.GONE : View.VISIBLE);
		builder.updateTextSizeSecondary(contentView, R.id.big_text);
		contentView.setBoolean(R.id.big_text, "setHasImage", builder.mN.hasLargeIcon());
		}
		}
		@@ -6201,7 +6178,6 @@ public class Notification implements Parcelable
		contentView.setViewVisibility(rowId, View.VISIBLE);
		contentView.setTextViewText(rowId, mBuilder.processTextSpans(
		makeMessageLine(m, mBuilder)));
		mBuilder.updateTextSizeSecondary(contentView, rowId);
		mBuilder.setTextViewColorSecondary(contentView, rowId);

		if (contractedMessage == m) {
		@@ -6569,7 +6545,6 @@ public class Notification implements Parcelable
		contentView.setViewVisibility(rowIds[i], View.VISIBLE);
		contentView.setTextViewText(rowIds[i],
		mBuilder.processTextSpans(mBuilder.processLegacyText(str)));
		mBuilder.updateTextSizeSecondary(contentView, rowIds[i]);
		mBuilder.setTextViewColorSecondary(contentView, rowIds[i]);
		contentView.setViewPadding(rowIds[i], 0, topPadding, 0, 0);
		handleInboxImageMargin(contentView, rowIds[i], first);

core/res/res/values/dimens.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -346,11 +346,6 @@
		<dimen name="notification_text_size">14sp</dimen>
		<!-- Size of notification text titles (see TextAppearance.StatusBar.EventContent.Title) -->
		<dimen name="notification_title_text_size">14sp</dimen>

		<!-- Size of notification text (see TextAppearance.StatusBar.EventContent) when colorized -->
		<dimen name="notification_text_size_colorized">16sp</dimen>
		<!-- Size of notification text titles (see TextAppearance.StatusBar.EventContent.Title) when colorized -->
		<dimen name="notification_title_text_size_colorized">20sp</dimen>
		<!-- Size of smaller notification text (see TextAppearance.StatusBar.EventContent.Line2, Info, Time) -->
		<dimen name="notification_subtext_size">12sp</dimen>

core/res/res/values/symbols.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -3050,9 +3050,6 @@
		<java-symbol type="array" name="config_allowedSystemInstantAppSettings" />
		<java-symbol type="array" name="config_allowedSecureInstantAppSettings" />

		<java-symbol type="dimen" name="notification_text_size_colorized" />
		<java-symbol type="dimen" name="notification_title_text_size_colorized" />

		<java-symbol type="bool" name="config_handleVolumeKeysInWindowManager" />
		<java-symbol type="dimen" name="config_inCallNotificationVolume" />
		<java-symbol type="string" name="config_inCallNotificationSound" />

packages/SystemUI/res/values/dimens.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -80,12 +80,6 @@
		<!-- Height of a small notification in the status bar which was used before android N -->
		<dimen name="notification_min_height_legacy">64dp</dimen>

		<!-- The increase in minHeight that is allowed when the notification is colorized -->
		<dimen name="notification_height_increase_colorized">11sp</dimen>

		<!-- The increase in minHeight that is allowed when the notification is colorized and has increased height (i.e messages) -->
		<dimen name="notification_height_increase_colorized_increased">13sp</dimen>

		<!-- Height of a large notification in the status bar -->
		<dimen name="notification_max_height">284dp</dimen>

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

+1 −9

Original line number	Diff line number	Diff line
		@@ -64,10 +64,10 @@ import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
		import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin.MenuItem;
		import com.android.systemui.statusbar.NotificationGuts.GutsContent;
		import com.android.systemui.statusbar.notification.AboveShelfChangedListener;
		import com.android.systemui.statusbar.notification.AboveShelfObserver;
		import com.android.systemui.statusbar.notification.HybridNotificationView;
		import com.android.systemui.statusbar.notification.NotificationInflater;
		import com.android.systemui.statusbar.notification.NotificationUtils;
		import com.android.systemui.statusbar.notification.NotificationViewWrapper;
		import com.android.systemui.statusbar.notification.VisualStabilityManager;
		import com.android.systemui.statusbar.phone.NotificationGroupManager;
		import com.android.systemui.statusbar.phone.StatusBar;
		@@ -436,9 +436,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		} else {
		minHeight = mNotificationMinHeight;
		}
		NotificationViewWrapper collapsedWrapper = layout.getVisibleWrapper(
		NotificationContentView.VISIBLE_TYPE_CONTRACTED);
		minHeight += collapsedWrapper.getMinHeightIncrease(mUseIncreasedCollapsedHeight);
		boolean headsUpCustom = layout.getHeadsUpChild() != null &&
		layout.getHeadsUpChild().getId()
		!= com.android.internal.R.id.status_bar_latest_event_content;
		@@ -450,11 +447,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		} else {
		headsUpheight = mMaxHeadsUpHeight;
		}
		NotificationViewWrapper headsUpWrapper = layout.getVisibleWrapper(
		NotificationContentView.VISIBLE_TYPE_HEADSUP);
		if (headsUpWrapper != null) {
		headsUpheight += headsUpWrapper.getMinHeightIncrease(mUseIncreasedCollapsedHeight);
		}
		layout.setHeights(minHeight, headsUpheight, mNotificationMaxHeight,
		mNotificationAmbientHeight);
		}