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

Commit 957bbcd9 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas
Browse files

[2/n] Remove use of `persist.wm.debug.desktop_mode_2` 

`persist.wm.debug.desktop_mode_2` is no longer needed as desktop
windowing now uses a runtime flag which can be modified using the command: `adb shell device_config put lse_desktop_experience
com.android.window.flags.enable_desktop_windowing_mode (true/false)`.

Flag: NONE
Fixes: 326060855
Bug: 304778354
Test: build & `adb shell device_config put lse_desktop_experience
com.android.window.flags.enable_desktop_windowing_mode true && adb
reboot` desktop windowing mode should be enabled.

Change-Id: I25d509c0912ab3266a32ad992333460332b8b0a2
parent 80232ea2

quickstep/src/com/android/quickstep/views/DesktopTaskView.java

+1 −11
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ import android.graphics.drawable.Drawable; 
import android.graphics.drawable.LayerDrawable;

import android.graphics.drawable.LayerDrawable;

import android.graphics.drawable.ShapeDrawable;

import android.graphics.drawable.ShapeDrawable;

import android.graphics.drawable.shapes.RoundRectShape;

import android.graphics.drawable.shapes.RoundRectShape;

import android.os.SystemProperties;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.util.Log;

import android.util.Log;

import android.util.SparseArray;

import android.util.SparseArray;
@@ -69,9 +68,6 @@ import java.util.function.Consumer; 
// TODO(b/249371338): TaskView needs to be refactored to have better support for N tasks.

// TODO(b/249371338): TaskView needs to be refactored to have better support for N tasks.

public class DesktopTaskView extends TaskView {

public class DesktopTaskView extends TaskView {





    private static final boolean DESKTOP_MODE_SUPPORTED = SystemProperties.getBoolean(

            "persist.wm.debug.desktop_mode_2", false);



    private static final String TAG = DesktopTaskView.class.getSimpleName();

    private static final String TAG = DesktopTaskView.class.getSimpleName();





    private static final boolean DEBUG = false;

    private static final boolean DEBUG = false;
@@ -94,13 +90,7 @@ public class DesktopTaskView extends TaskView { 




    /** Check whether desktop windowing is enabled */

    /** Check whether desktop windowing is enabled */

    public static boolean isDesktopModeSupported() {

    public static boolean isDesktopModeSupported() {

        // Check for aconfig flag first

        return Flags.enableDesktopWindowingMode();

        if (Flags.enableDesktopWindowingMode()) {

            return true;

        }

        // Fall back to sysprop flag

        // TODO(b/304778354): remove sysprop once desktop aconfig flag supports dynamic overriding

        return DESKTOP_MODE_SUPPORTED;

    }

    }





    public DesktopTaskView(Context context) {

    public DesktopTaskView(Context context) {

src/com/android/launcher3/Launcher.java

+1 −5
Original line number Original line Diff line number Diff line
@@ -318,9 +318,6 @@ public class Launcher extends StatefulActivity<LauncherState> 
    private static final FloatProperty<Hotseat> HOTSEAT_WIDGET_SCALE =

    private static final FloatProperty<Hotseat> HOTSEAT_WIDGET_SCALE =

            HOTSEAT_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_WIDGET_TRANSITION);

            HOTSEAT_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_WIDGET_TRANSITION);





    private static final boolean DESKTOP_MODE_SUPPORTED =

            "1".equals(Utilities.getSystemProperty("persist.wm.debug.desktop_mode_2", "0"));



    private final ModelCallbacks mModelCallbacks = createModelCallbacks();

    private final ModelCallbacks mModelCallbacks = createModelCallbacks();





    private final KeyboardShortcutsDelegate mKeyboardShortcutsDelegate =

    private final KeyboardShortcutsDelegate mKeyboardShortcutsDelegate =
@@ -2713,8 +2710,7 @@ public class Launcher extends StatefulActivity<LauncherState> 
    }

    }





    private void updateDisallowBack() {

    private void updateDisallowBack() {

        // TODO(b/304778354): remove sysprop once desktop aconfig flag supports dynamic overriding

        if (Flags.enableDesktopWindowingMode()) {

        if (Flags.enableDesktopWindowingMode() || DESKTOP_MODE_SUPPORTED) {

            // Do not disable back in launcher when prototype behavior is enabled

            // Do not disable back in launcher when prototype behavior is enabled

            return;

            return;

        }

        }