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

Commit edb0d6b4 authored by Winson Chung's avatar Winson Chung
Browse files

Disable the two-swipe when quickstep is disabled.

Change-Id: I5eee57def216406fd8f7766ba4b87cd5de98f0a4
parent 9869f758
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -16,7 +16,11 @@

package com.android.launcher3.uioverrides;

import static com.android.launcher3.Utilities.getPrefs;
import static com.android.quickstep.OverviewInteractionState.KEY_SWIPE_UP_ENABLED;

import android.content.Context;
import android.content.SharedPreferences;
import android.view.View;
import android.view.View.AccessibilityDelegate;

@@ -33,6 +37,14 @@ import com.android.quickstep.views.RecentsView;
public class UiFactory {

    public static TouchController[] createTouchControllers(Launcher launcher) {
        SharedPreferences prefs = getPrefs(launcher);
        boolean swipeUpEnabled = prefs.getBoolean(KEY_SWIPE_UP_ENABLED, true);
        if (!swipeUpEnabled) {
            return new TouchController[] {
                    launcher.getDragController(),
                    new LandscapeStatesTouchController(launcher),
                    new TaskViewTouchController(launcher)};
        }
        if (launcher.getDeviceProfile().isVerticalBarLayout()) {
            return new TouchController[] {
                    launcher.getDragController(),
+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class OverviewInteractionState implements OnSharedPreferenceChangeListene
        return INSTANCE;
    }

    private static final String KEY_SWIPE_UP_ENABLED = "pref_enable_quickstep";
    public static final String KEY_SWIPE_UP_ENABLED = "pref_enable_quickstep";

    private static final int MSG_SET_PROXY = 200;
    private static final int MSG_SET_BACK_BUTTON_VISIBLE = 201;
+9 −0
Original line number Diff line number Diff line
@@ -242,6 +242,12 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, L

    private RotationHelper mRotationHelper;

    // Used to keep track of the swipe up state
    private SharedPreferences.OnSharedPreferenceChangeListener mSharedPrefsListener =
            (sharedPreferences, s) -> {
                mDragLayer.setup(mDragController);
            };

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        if (DEBUG_STRICT_MODE) {
@@ -273,6 +279,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, L
        initDeviceProfile(app.getInvariantDeviceProfile());

        mSharedPrefs = Utilities.getPrefs(this);
        mSharedPrefs.registerOnSharedPreferenceChangeListener(mSharedPrefsListener);
        mIconCache = app.getIconCache();
        mAccessibilityDelegate = new LauncherAccessibilityDelegate(this);

@@ -758,6 +765,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, L
        }
        NotificationListener.removeNotificationsChangedListener();
        getStateManager().moveToRestState();

    }

    @Override
@@ -1340,6 +1348,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, L
            LauncherAppState.getInstance(this).setLauncher(null);
        }
        mRotationHelper.destroy();
        mSharedPrefs.unregisterOnSharedPreferenceChangeListener(mSharedPrefsListener);

        try {
            mAppWidgetHost.stopListening();