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

Commit 304d7f44 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Show channel description."

parents 3a32ee61 521c8751

res/xml/channel_notification_settings.xml

+0 −1
Original line number Diff line number Diff line
@@ -69,5 +69,4 @@ 
            android:title="@string/app_notification_override_dnd_title"

            android:summary="@string/app_notification_override_dnd_summary"

            settings:useAdditionalSummary="true" />



</PreferenceScreen>

src/com/android/settings/notification/AppNotificationSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ public class AppNotificationSettings extends NotificationSettingsBase { 
            int deletedChannelCount = mBackend.getDeletedChannelCount(mAppRow.pkg, mAppRow.uid);

            if (deletedChannelCount > 0) {

                DimmableIconPreference deletedPref = new DimmableIconPreference(getPrefContext());

                deletedPref.setEnabled(false);

                deletedPref.setSelectable(false);

                deletedPref.setTitle(getResources().getQuantityString(

                        R.plurals.deleted_channels, deletedChannelCount, deletedChannelCount));

                deletedPref.setIcon(R.drawable.ic_info);

src/com/android/settings/notification/ChannelNotificationSettings.java

+9 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.util.Log; 


import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.widget.LockPatternUtils;

import com.android.settings.DimmableIconPreference;

import com.android.settings.R;

import com.android.settings.RingtonePreference;

import com.android.settings.applications.AppHeaderController;
@@ -131,6 +132,14 @@ public class ChannelNotificationSettings extends NotificationSettingsBase { 
            intentPref.setTitle(mContext.getString(R.string.app_settings_link));

            getPreferenceScreen().addPreference(intentPref);

        }



        if (!TextUtils.isEmpty(mChannel.getDescription())) {

            DimmableIconPreference descPref = new DimmableIconPreference(getPrefContext());

            descPref.setSelectable(false);

            descPref.setSummary(mChannel.getDescription());

            descPref.setIcon(R.drawable.ic_info);

            getPreferenceScreen().addPreference(descPref);

        }

    }



    private void setupLights() {