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

Commit 75845ed9 authored by Andy Wickham's avatar Andy Wickham
Browse files

Adds a removeChangeListener to FeatureFlags$BooleanFlag. 

This will help us avoid leaks, etc.

Also changes ENABLE_SMARTSPACE_ENHANCED back to a DeviceFlag

Bug: 181194850
Bug: 181077020
Test: atest NexusLauncherOutOfProcTests:com.android.launcher3.memory.MemoryTests -- --abi armeabi-v7a
Change-Id: I6f54af3e6b6302a073b8b7d448ff72b05a803d8f
parent d6844dcb

quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java

+8 −0
Original line number Diff line number Diff line
@@ -60,6 +60,14 @@ public class DeviceFlag extends DebugFlag { 
        mListeners.add(r);

    }



    @Override

    public void removeChangeListener(Runnable r) {

        if (mListeners == null) {

            return;

        }

        mListeners.remove(r);

    }



    private void registerDeviceConfigChangedListener(Context context) {

        DeviceConfig.addOnPropertiesChangedListener(

                NAMESPACE_LAUNCHER,

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

+3 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ public final class FeatureFlags { 
            "ENABLE_SMARTSPACE_UNIVERSAL", false,

            "Replace Smartspace with a version rendered by System UI.");



    public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = getDebugFlag(

    public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = new DeviceFlag(

            "ENABLE_SMARTSPACE_ENHANCED", false,

            "Replace Smartspace with the enhanced version. "

              + "Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");
@@ -263,6 +263,8 @@ public final class FeatureFlags { 
        }



        public void addChangeListener(Context context, Runnable r) { }



        public void removeChangeListener(Runnable r) {}

    }



    public static class DebugFlag extends BooleanFlag {