Merge "Improved the transitions and layout of the app name in conversations"... (f2ec0f0c) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/ConversationLayout.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -469,6 +469,10 @@ public class ConversationLayout extends FrameLayout
		mAppName.setVisibility(mIsCollapsed ? GONE : VISIBLE);
		}

		public boolean shouldHideAppName() {
		return mIsCollapsed;
		}

		/**
		* update the icon position and sizing
		*/

core/res/res/layout/notification_template_material_conversation.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -122,6 +122,7 @@
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:paddingTop="16dp"
		android:layout_marginBottom="2dp"
		android:paddingStart="@dimen/conversation_content_start"
		>
		<TextView
		@@ -180,8 +181,8 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="@dimen/conversation_content_start"
		android:paddingBottom="16dp"
		android:textSize="12sp"
		android:layout_marginBottom="16dp"
		android:textAppearance="@style/TextAppearance.DeviceDefault.Notification"
		/>

		@@ -190,7 +191,6 @@
		android:id="@+id/notification_messaging"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="2dp"
		android:spacing="@dimen/notification_messaging_spacing"
		android:clipToPadding="false"
		android:clipChildren="false"

core/res/res/values/dimens.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -697,9 +697,9 @@
		<!-- size of the notification badge when applied to the conversation icon -->
		<dimen name="conversation_icon_size_badged">20dp</dimen>
		<!-- size of the notification badge when centered in a conversation -->
		<dimen name="conversation_icon_size_centered">25dp</dimen>
		<dimen name="conversation_icon_size_centered">26dp</dimen>
		<!-- margin on the top when the icon is centered for group conversations -->
		<dimen name="conversation_icon_margin_top_centered">5dp</dimen>
		<dimen name="conversation_icon_margin_top_centered">12dp</dimen>

		<!-- The padding of the conversation header when expanded. This is calculated from the expand button size + notification_content_margin_end -->
		<dimen name="conversation_header_expanded_padding_end">38dp</dimen>

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -50,8 +50,10 @@ public class CrossFadeHelper {
		if (endRunnable != null) {
		endRunnable.run();
		}
		if (view.getVisibility() != View.GONE) {
		view.setVisibility(View.INVISIBLE);
		}
		}
		});
		if (view.hasOverlappingRendering()) {
		view.animate().withLayer();
		@@ -75,7 +77,7 @@ public class CrossFadeHelper {
		*/
		public static void fadeOut(View view, float fadeOutAmount, boolean remap) {
		view.animate().cancel();
		if (fadeOutAmount == 1.0f) {
		if (fadeOutAmount == 1.0f && view.getVisibility() != View.GONE) {
		view.setVisibility(View.INVISIBLE);
		} else if (view.getVisibility() == View.INVISIBLE) {
		view.setVisibility(View.VISIBLE);

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

+29 −11

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.widget.ImageView;
		import android.widget.TextView;

		import com.android.internal.util.ContrastColorUtil;
		import com.android.internal.widget.ConversationLayout;
		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
		import com.android.systemui.statusbar.notification.row.NotificationContentView;

		@@ -42,6 +43,7 @@ public class NotificationHeaderUtil {

		private static final TextViewComparator sTextViewComparator = new TextViewComparator();
		private static final VisibilityApplicator sVisibilityApplicator = new VisibilityApplicator();
		private static final VisibilityApplicator sAppNameApplicator = new AppNameApplicator();
		private static final DataExtractor sIconExtractor = new DataExtractor() {
		@Override
		public Object extractData(ExpandableNotificationRow row) {
		@@ -64,7 +66,7 @@ public class NotificationHeaderUtil {
		};
		private final static ResultApplicator mGreyApplicator = new ResultApplicator() {
		@Override
		public void apply(View view, boolean apply) {
		public void apply(View parent, View view, boolean apply, boolean reset) {
		NotificationHeaderView header = (NotificationHeaderView) view;
		ImageView icon = (ImageView) view.findViewById(
		com.android.internal.R.id.icon);
		@@ -132,8 +134,12 @@ public class NotificationHeaderUtil {
		}
		},
		sVisibilityApplicator));
		mComparators.add(HeaderProcessor.forTextView(mRow,
		com.android.internal.R.id.app_name_text));
		mComparators.add(new HeaderProcessor(
		mRow,
		com.android.internal.R.id.app_name_text,
		null,
		sTextViewComparator,
		sAppNameApplicator));
		mComparators.add(HeaderProcessor.forTextView(mRow,
		com.android.internal.R.id.header_text));
		mDividers.add(com.android.internal.R.id.header_text_divider);
		@@ -299,19 +305,19 @@ public class NotificationHeaderUtil {
		public void apply(ExpandableNotificationRow row, boolean reset) {
		boolean apply = mApply && !reset;
		if (row.isSummaryWithChildren()) {
		applyToView(apply, row.getNotificationHeader());
		applyToView(apply, reset, row.getNotificationHeader());
		return;
		}
		applyToView(apply, row.getPrivateLayout().getContractedChild());
		applyToView(apply, row.getPrivateLayout().getHeadsUpChild());
		applyToView(apply, row.getPrivateLayout().getExpandedChild());
		applyToView(apply, reset, row.getPrivateLayout().getContractedChild());
		applyToView(apply, reset, row.getPrivateLayout().getHeadsUpChild());
		applyToView(apply, reset, row.getPrivateLayout().getExpandedChild());
		}

		private void applyToView(boolean apply, View parent) {
		private void applyToView(boolean apply, boolean reset, View parent) {
		if (parent != null) {
		View view = parent.findViewById(mId);
		if (view != null && !mComparator.isEmpty(view)) {
		mApplicator.apply(view, apply);
		mApplicator.apply(parent, view, apply, reset);
		}
		}
		}
		@@ -375,14 +381,26 @@ public class NotificationHeaderUtil {
		}

		private interface ResultApplicator {
		void apply(View view, boolean apply);
		void apply(View parent, View view, boolean apply, boolean reset);
		}

		private static class VisibilityApplicator implements ResultApplicator {

		@Override
		public void apply(View view, boolean apply) {
		public void apply(View parent, View view, boolean apply, boolean reset) {
		view.setVisibility(apply ? View.GONE : View.VISIBLE);
		}
		}

		private static class AppNameApplicator extends VisibilityApplicator {

		@Override
		public void apply(View parent, View view, boolean apply, boolean reset) {
		if (reset && parent instanceof ConversationLayout) {
		ConversationLayout layout = (ConversationLayout) parent;
		apply = layout.shouldHideAppName();
		}
		super.apply(parent, view, apply, reset);
		}
		}
		}