Merge "Disable notification listener on pre-26" into ub-launcher3-dorval

res/values-v25/bools.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
-    <!-- TODO(b/35443111): remove from v25 and keep in v26 -->
-    <bool name="notification_badging_enabled">true</bool>
-</resources>

src/com/android/launcher3/notification/NotificationListener.java

@@ -28,7 +28,6 @@ import android.support.v4.util.Pair;
 import android.text.TextUtils;
 
 import com.android.launcher3.LauncherModel;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.PackageUserKey;
 
@@ -219,11 +218,9 @@ public class NotificationListener extends NotificationListenerService {
     }
 
     private boolean shouldBeFilteredOut(StatusBarNotification sbn) {
-        if (Utilities.isAtLeastO()) {
+        getCurrentRanking().getRanking(sbn.getKey(), mTempRanking);
-            getCurrentRanking().getRanking(sbn.getKey(), mTempRanking);
+        if (!mTempRanking.canShowBadge()) {
-            if (!mTempRanking.canShowBadge()) {
+            return true;
-                return true;
-            }
         }
         Notification notification = sbn.getNotification();
         if (mTempRanking.getChannel().getId().equals(NotificationChannel.DEFAULT_CHANNEL_ID)) {