Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a8f0553 authored by Geoffrey Pitsch's avatar Geoffrey Pitsch
Browse files

Hide secondary text for Default channel if not blocked 

Secondary text was confusing to user.
Test: runtest systemui
Bug: 37509710

Change-Id: Ie4cf66c751b3b7b3943ca1c1ff557e8784ae39b0
parent a017e573

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

+3 −1
Original line number Diff line number Diff line
@@ -329,12 +329,14 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G 
    private void updateSecondaryText() {

        final boolean disabled = mSingleNotificationChannel != null &&

                getSelectedImportance() == IMPORTANCE_NONE;

        final boolean isDefaultChannel = mSingleNotificationChannel != null &&

                mSingleNotificationChannel.getId().equals(NotificationChannel.DEFAULT_CHANNEL_ID);

        if (disabled) {

            mChannelDisabledView.setVisibility(View.VISIBLE);

            mNumChannelsView.setVisibility(View.GONE);

        } else {

            mChannelDisabledView.setVisibility(View.GONE);

            mNumChannelsView.setVisibility(View.VISIBLE);

            mNumChannelsView.setVisibility(isDefaultChannel ? View.INVISIBLE : View.VISIBLE);

        }

    }

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

+2 −4
Original line number Diff line number Diff line
@@ -314,16 +314,14 @@ public class NotificationInfoTest extends SysuiTestCase { 
    }



    @Test

    public void testBindNotification_NumChannelsTextUniqueWhenDefaultChannel() throws Exception {

    public void testBindNotification_NumChannelsTextHiddenWhenDefaultChannel() throws Exception {

        mNotificationInfo.bindNotification(mMockPackageManager, mMockINotificationManager,

                TEST_PACKAGE_NAME, Arrays.asList(mDefaultNotificationChannel),

                mNotificationChannel.getImportance(), mSbn, null, null,

                null, null, null);

        final TextView numChannelsView =

                (TextView) mNotificationInfo.findViewById(R.id.num_channels_desc);

        assertEquals(View.VISIBLE, numChannelsView.getVisibility());

        assertEquals(mContext.getString(R.string.notification_default_channel_desc),

                numChannelsView.getText());

        assertEquals(View.INVISIBLE, numChannelsView.getVisibility());

    }



    @Test