Merge "Fix name in partial convo guts" into rvc-dev (966c3e95) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -192,9 +192,9 @@ public class PartialConversationInfo extends LinearLayout implements
		private void bindName() {
		TextView name = findViewById(R.id.name);
		Bundle extras = mSbn.getNotification().extras;
		String nameString = extras.getString(Notification.EXTRA_CONVERSATION_TITLE);
		CharSequence nameString = extras.getCharSequence(Notification.EXTRA_CONVERSATION_TITLE, "");
		if (TextUtils.isEmpty(nameString)) {
		nameString = extras.getString(Notification.EXTRA_TITLE);
		nameString = extras.getCharSequence(Notification.EXTRA_TITLE, "");
		}
		name.setText(nameString);
		}

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

+22 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import android.service.notification.StatusBarNotification;
		import android.test.suitebuilder.annotation.SmallTest;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper;
		import android.text.SpannableString;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.widget.ImageView;
		@@ -151,8 +152,11 @@ public class PartialConversationInfoTest extends SysuiTestCase {
		NotificationChannel.DEFAULT_CHANNEL_ID, TEST_CHANNEL_NAME,
		IMPORTANCE_LOW);
		mDefaultNotificationChannelSet.add(mDefaultNotificationChannel);
		Notification n = new Notification.Builder(mContext, mNotificationChannel.getId())
		.setContentTitle(new SpannableString("title"))
		.build();
		mSbn = new StatusBarNotification(TEST_PACKAGE_NAME, TEST_PACKAGE_NAME, 0, null, TEST_UID, 0,
		new Notification(), UserHandle.CURRENT, null, 0);
		n, UserHandle.CURRENT, null, 0);
		mEntry = new NotificationEntryBuilder().setSbn(mSbn).build();
		}

		@@ -175,6 +179,23 @@ public class PartialConversationInfoTest extends SysuiTestCase {
		assertEquals(VISIBLE, mInfo.findViewById(R.id.header).getVisibility());
		}

		@Test
		public void testBindNotification_SetsName() {
		mInfo.bindNotification(
		mMockPackageManager,
		mMockINotificationManager,
		mChannelEditorDialogController,
		TEST_PACKAGE_NAME,
		mNotificationChannel,
		mNotificationChannelSet,
		mEntry,
		null,
		true,
		false);
		final TextView textView = mInfo.findViewById(R.id.name);
		assertTrue(textView.getText().toString().contains("title"));
		}

		@Test
		public void testBindNotification_groupSetsPackageIcon() {
		mEntry.getSbn().getNotification().extras.putBoolean(EXTRA_IS_GROUP_CONVERSATION, true);