PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 'show badge' for pre O apps" into pi-dev am: d31c655a12

Browse Source 
am: 11a9d03687

Change-Id: Ib81c3784e158459a06ddc58d373dd0687d9d64c6
This commit is contained in:
Julia Reynolds
2018-03-30 01:41:19 +00:00
committed by android-build-merger
parent 56dd224609 11a9d03687
commit d81633ab96
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/notification/BadgePreferenceController.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.notification;
import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
import android.app.NotificationChannel;
import android.content.Context;
import android.provider.Settings;
import android.support.v7.preference.Preference;
@@ -55,8 +56,12 @@ public class BadgePreferenceController extends NotificationPreferenceController
NOTIFICATION_BADGING, SYSTEM_WIDE_ON) == SYSTEM_WIDE_OFF) {
return false;
}
if (mChannel != null && !mAppRow.showBadge) {
return false;
if (mChannel != null) {
if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId())) {
return true;
} else {
return mAppRow.showBadge;
}
}
return true;
}