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

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

Merge "Non-blockable whitelist should only control importance fields" into qt-dev

parents d0dd6d88 73c64751

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class AllowSoundPreferenceController extends NotificationPreferenceContro 
        if (mChannel != null) {

            RestrictedSwitchPreference pref = (RestrictedSwitchPreference) preference;

            pref.setDisabledByAdmin(mAdmin);

            pref.setEnabled(isChannelConfigurable() && !pref.isDisabledByAdmin());

            pref.setEnabled(!pref.isDisabledByAdmin());

            pref.setChecked(mChannel.getImportance() >= IMPORTANCE_DEFAULT

                    || mChannel.getImportance() == IMPORTANCE_UNSPECIFIED);

        } else { Log.i(TAG, "tried to updatestate on a null channel?!"); }

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

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class BadgePreferenceController extends NotificationPreferenceController 
            pref.setDisabledByAdmin(mAdmin);

            if (mChannel != null) {

                pref.setChecked(mChannel.canShowBadge());

                pref.setEnabled(isChannelConfigurable() && !pref.isDisabledByAdmin());

                pref.setEnabled(!pref.isDisabledByAdmin());

            } else {

                pref.setChecked(mAppRow.showBadge);

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class BubblePreferenceController extends NotificationPreferenceController 
            pref.setDisabledByAdmin(mAdmin);

            if (mChannel != null) {

                pref.setChecked(mChannel.canBubble());

                pref.setEnabled(isChannelConfigurable() && !pref.isDisabledByAdmin());

                pref.setEnabled(!pref.isDisabledByAdmin());

            } else {

                pref.setChecked(mAppRow.allowBubbles

                        && Settings.Secure.getInt(mContext.getContentResolver(),

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public class DndPreferenceController extends NotificationPreferenceController 
        if (mChannel != null) {

            RestrictedSwitchPreference pref = (RestrictedSwitchPreference) preference;

            pref.setDisabledByAdmin(mAdmin);

            pref.setEnabled(isChannelConfigurable() && !pref.isDisabledByAdmin());

            pref.setEnabled(!pref.isDisabledByAdmin());

            pref.setChecked(mChannel.canBypassDnd());

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class HighImportancePreferenceController extends NotificationPreferenceCo 
    @Override

    public void updateState(Preference preference) {

        if (mAppRow != null && mChannel != null) {

            preference.setEnabled(mAdmin == null && isChannelConfigurable());

            preference.setEnabled(mAdmin == null && isChannelBlockable());



            RestrictedSwitchPreference pref = (RestrictedSwitchPreference) preference;

            pref.setChecked(mChannel.getImportance() >= IMPORTANCE_HIGH);