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

Commit 86ba394a authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Remove notification dots setting for Launcher3Go" into ub-launcher3-dorval-polish2

parents 78356a54 c138515c

go/res/values-v26/bools.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?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>

    <bool name="notification_badging_enabled">false</bool>

</resources>
 
 No newline at end of file

src/com/android/launcher3/SettingsActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ public class SettingsActivity extends Activity { 
                getPreferenceScreen().removePreference(

                        findPreference(SessionCommitReceiver.ADD_ICON_PREFERENCE_KEY));

                getPreferenceScreen().removePreference(iconBadgingPref);

            } else if (!getResources().getBoolean(R.bool.notification_badging_enabled)) {

                getPreferenceScreen().removePreference(iconBadgingPref);

            } else {

                // Listen to system notification badge settings while this UI is active.

                mIconBadgingObserver = new IconBadgingObserver(

src/com/android/launcher3/config/BaseFlags.java

+0 −2
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ abstract class BaseFlags { 
    public static final boolean PULLDOWN_SEARCH = false;

    // When enabled the status bar may show dark icons based on the top of the wallpaper.

    public static final boolean LIGHT_STATUS_BAR = false;

    // When enabled icons are badged with the number of notifications associated with that app.

    public static final boolean BADGE_ICONS = true;

    // When enabled, icons not supporting {@link AdaptiveIconDrawable} will be wrapped in {@link FixedScaleDrawable}.

    public static final boolean LEGACY_ICON_TREATMENT = true;

    // When enabled, adaptive icons would have shadows baked when being stored to icon cache.

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

+0 −4
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.util.Log; 
import android.util.Pair;



import com.android.launcher3.LauncherModel;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.util.PackageUserKey;

import com.android.launcher3.util.SettingsObserver;
@@ -164,9 +163,6 @@ public class NotificationListener extends NotificationListenerService { 
    }



    public static void setNotificationsChangedListener(NotificationsChangedListener listener) {

        if (!FeatureFlags.BADGE_ICONS) {

            return;

        }

        sNotificationsChangedListener = listener;



        NotificationListener notificationListener = getInstanceIfConnected();