Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide secondary text for Default channel if not blocked" into oc-dev

Browse Source 
am: 9226516cef

Change-Id: Ic891296eea429842559bf010ab11845d1d3eecdc
This commit is contained in:
Geoffrey Pitsch
2017-04-24 19:23:30 +00:00
committed by android-build-merger
parent 28a9a1a61e 9226516cef
commit 7561c3fb53
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java
View File

@@ -329,12 +329,14 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
private void updateSecondaryText() { private void updateSecondaryText() {
final boolean disabled = mSingleNotificationChannel != null && final boolean disabled = mSingleNotificationChannel != null &&
getSelectedImportance() == IMPORTANCE_NONE; getSelectedImportance() == IMPORTANCE_NONE;
final boolean isDefaultChannel = mSingleNotificationChannel != null &&
mSingleNotificationChannel.getId().equals(NotificationChannel.DEFAULT_CHANNEL_ID);
if (disabled) { if (disabled) {
mChannelDisabledView.setVisibility(View.VISIBLE); mChannelDisabledView.setVisibility(View.VISIBLE);
mNumChannelsView.setVisibility(View.GONE); mNumChannelsView.setVisibility(View.GONE);
} else { } else {
mChannelDisabledView.setVisibility(View.GONE); mChannelDisabledView.setVisibility(View.GONE);
mNumChannelsView.setVisibility(View.VISIBLE); mNumChannelsView.setVisibility(isDefaultChannel ? View.INVISIBLE : View.VISIBLE);
} }
} }

6
packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationInfoTest.java
View File

@@ -314,16 +314,14 @@ public class NotificationInfoTest extends SysuiTestCase {
} }
@Test @Test
public void testBindNotification_NumChannelsTextUniqueWhenDefaultChannel() throws Exception { public void testBindNotification_NumChannelsTextHiddenWhenDefaultChannel() throws Exception {
mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager, mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,
TEST_PACKAGE_NAME, Arrays.asList(mDefaultNotificationChannel), TEST_PACKAGE_NAME, Arrays.asList(mDefaultNotificationChannel),
mNotificationChannel.getImportance(), mSbn, null, null, mNotificationChannel.getImportance(), mSbn, null, null,
null, null, null); null, null, null);
final TextView numChannelsView = final TextView numChannelsView =
(TextView) mNotificationInfo.findViewById(R.id.num_channels_desc); (TextView) mNotificationInfo.findViewById(R.id.num_channels_desc);
assertEquals(View.VISIBLE, numChannelsView.getVisibility()); assertEquals(View.INVISIBLE, numChannelsView.getVisibility());
assertEquals(mContext.getString(R.string.notification_default_channel_desc),
numChannelsView.getText());
} }
@Test @Test