Merge "Merge "Some of header changes for partial convo settings" into rvc-dev... (a77bfce4) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/partial_conversation_info.xml

+7 −26

Original line number	Original line	Diff line number	Diff line
	@@ -52,39 +52,20 @@
	android:gravity="center_vertical"		android:gravity="center_vertical"
	android:layout_alignEnd="@id/conversation_icon"		android:layout_alignEnd="@id/conversation_icon"
	android:layout_toEndOf="@id/conversation_icon">		android:layout_toEndOf="@id/conversation_icon">
	<LinearLayout
	android:layout_width="match_parent"
	android:layout_height="wrap_content"
	android:gravity="start"
	android:orientation="horizontal">
	<TextView		<TextView
	android:id="@+id/name"		android:id="@+id/name"
	android:layout_width="wrap_content"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
			android:ellipsize="end"
			android:textDirection="locale"
	style="@style/TextAppearance.NotificationImportanceChannel"/>		style="@style/TextAppearance.NotificationImportanceChannel"/>
	<TextView
	android:layout_width="wrap_content"
	android:layout_height="wrap_content"
	android:layout_centerVertical="true"
	style="@style/TextAppearance.NotificationImportanceHeader"
	android:layout_marginStart="2dp"
	android:layout_marginEnd="2dp"
	android:text="@*android:string/notification_header_divider_symbol" />
	<TextView		<TextView
	android:id="@+id/parent_channel_name"		android:id="@+id/parent_channel_name"
	android:layout_width="wrap_content"
	android:layout_height="wrap_content"
	style="@style/TextAppearance.NotificationImportanceChannel"/>

	</LinearLayout>
	<TextView
	android:id="@+id/pkg_name"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	style="@style/TextAppearance.NotificationImportanceChannelGroup"
	android:ellipsize="end"		android:ellipsize="end"
	android:textDirection="locale"		android:textDirection="locale"
	android:maxLines="1"/>		style="@style/TextAppearance.NotificationImportanceChannel"/>
	<TextView		<TextView
	android:id="@+id/group_name"		android:id="@+id/group_name"
	android:layout_width="match_parent"		android:layout_width="match_parent"

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/PartialConversationInfo.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -241,7 +241,6 @@ public class PartialConversationInfo extends LinearLayout implements
	} catch (PackageManager.NameNotFoundException e) {		} catch (PackageManager.NameNotFoundException e) {
	mPkgIcon = mPm.getDefaultActivityIcon();		mPkgIcon = mPm.getDefaultActivityIcon();
	}		}
	((TextView) findViewById(R.id.pkg_name)).setText(mAppName);
	}		}

	private void bindDelegate() {		private void bindDelegate() {

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/PartialConversationInfoTest.java

+0 −19

Original line number	Original line	Diff line number	Diff line
	@@ -160,25 +160,6 @@ public class PartialConversationInfoTest extends SysuiTestCase {
	mEntry = new NotificationEntryBuilder().setSbn(mSbn).build();		mEntry = new NotificationEntryBuilder().setSbn(mSbn).build();
	}		}

	@Test
	public void testBindNotification_SetsTextApplicationName() throws Exception {
	when(mMockPackageManager.getApplicationLabel(any())).thenReturn("App Name");
	mInfo.bindNotification(
	mMockPackageManager,
	mMockINotificationManager,
	mChannelEditorDialogController,
	TEST_PACKAGE_NAME,
	mNotificationChannel,
	mNotificationChannelSet,
	mEntry,
	null,
	true,
	false);
	final TextView textView = mInfo.findViewById(R.id.pkg_name);
	assertTrue(textView.getText().toString().contains("App Name"));
	assertEquals(VISIBLE, mInfo.findViewById(R.id.header).getVisibility());
	}

	@Test		@Test
	public void testBindNotification_SetsName() {		public void testBindNotification_SetsName() {
	mInfo.bindNotification(		mInfo.bindNotification(