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

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

Merge "Notification settings updates" into pi-dev

parents 09793d19 d7815fe1

res/layout/preference_app.xml

+2 −2
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ 
        android:id="@android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="end|center_vertical"

        android:paddingStart="16dp"

        android:gravity="center"

        android:minWidth="64dp"

        android:orientation="vertical" />



</LinearLayout>

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -7515,9 +7515,9 @@ 
    <string name="default_notification_assistant">Notification assistant</string>









    <!-- app summary of notification app list screen [CHAR LIMIT=100] -->









    <string name="notifications_sent_daily">~<xliff:g id="number">%1$s</xliff:g> sent daily</string>









    <string name="notifications_sent_daily">~<xliff:g id="number">%1$s</xliff:g> per day</string>









    <!-- app summary of notification app list screen [CHAR LIMIT=100] -->









    <string name="notifications_sent_weekly">~<xliff:g id="number">%1$s</xliff:g> sent weekly</string>









    <string name="notifications_sent_weekly">~<xliff:g id="number">%1$s</xliff:g> per week</string>









    <!-- app summary of notification app list screen [CHAR LIMIT=100] -->









    <string name="notifications_sent_never">Never</string>

































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



+3
−3






























Original line number
Diff line number
Diff line







@@ -167,9 +167,9 @@ public class AppNotificationSettings extends NotificationSettingsBase {







            getPreferenceScreen().addPreference(groupCategory);









            mDynamicPreferences.add(groupCategory);









            if (group.getId() == null) {









                groupCategory.setTitle(mChannelGroupList.size() > 1









                        ? R.string.notification_channels_other









                        : R.string.notification_channels);









                if (mChannelGroupList.size() > 1) {









                    groupCategory.setTitle(R.string.notification_channels_other);









                }









                groupCategory.setKey(KEY_GENERAL_CATEGORY);









            } else {









                groupCategory.setTitle(group.getName());
































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



+1
−1






























Original line number
Diff line number
Diff line







@@ -57,7 +57,7 @@ public class BadgePreferenceController extends NotificationPreferenceController







            return false;









        }









        if (mChannel != null) {









            if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId())) {









            if (isDefaultChannel()) {









                return true;









            } else {









                return mAppRow.showBadge;
































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



+1
−2






























Original line number
Diff line number
Diff line







@@ -98,8 +98,7 @@ public class BlockPreferenceController extends NotificationPreferenceController







            // it was blocked and we are unblocking it.









            if (blocked || originalImportance == IMPORTANCE_NONE) {









                final int importance = blocked ? IMPORTANCE_NONE









                        : DEFAULT_CHANNEL_ID.equals(mChannel.getId())









                                ? IMPORTANCE_UNSPECIFIED : IMPORTANCE_DEFAULT;









                        : isDefaultChannel() ? IMPORTANCE_UNSPECIFIED : IMPORTANCE_DEFAULT;









                mChannel.setImportance(importance);









                saveChannel();









            }