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

Commit e25101a2 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Clean up outdated back flags" into main

parents aa7c743e 7342ff5e

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −10
Original line number Diff line number Diff line
@@ -367,16 +367,6 @@ object Flags { 
    val WM_ALWAYS_ENFORCE_PREDICTIVE_BACK =

        sysPropBooleanFlag("persist.wm.debug.predictive_back_always_enforce", default = false)



    // TODO(b/254512728): Tracking Bug

    @JvmField val NEW_BACK_AFFORDANCE = releasedFlag("new_back_affordance")





    // TODO(b/270987164): Tracking Bug

    @JvmField val TRACKPAD_GESTURE_FEATURES = releasedFlag("trackpad_gesture_features")



    // TODO(b/273800936): Tracking Bug

    @JvmField val TRACKPAD_GESTURE_COMMON = releasedFlag("trackpad_gesture_common")



    // TODO(b/251205791): Tracking Bug

    @JvmField val SCREENSHOT_APP_CLIPS = releasedFlag("screenshot_app_clips")

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+9 −39
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; 
import com.android.internal.policy.GestureNavigationSettingsObserver;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.model.SysUiState;

import com.android.systemui.navigationbar.NavigationModeController;

import com.android.systemui.plugins.FalsingManager;
@@ -219,10 +217,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
    private final Region mExcludeRegion = new Region();

    private final Region mDesktopModeExcludeRegion = new Region();

    private final Region mUnrestrictedExcludeRegion = new Region();

    private final Provider<NavigationBarEdgePanel> mNavBarEdgePanelProvider;

    private final Provider<BackGestureTfClassifierProvider>

            mBackGestureTfClassifierProviderProvider;

    private final FeatureFlags mFeatureFlags;

    private final Provider<LightBarController> mLightBarControllerProvider;



    // The left side edge width where touch down is allowed
@@ -264,8 +260,6 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
    private boolean mIsEnabled;

    private boolean mIsNavBarShownTransiently;

    private boolean mIsBackGestureAllowed;

    private boolean mIsNewBackAffordanceEnabled;

    private boolean mIsTrackpadGestureFeaturesEnabled;

    private boolean mIsTrackpadThreeFingerSwipe;

    private boolean mIsButtonForcedVisible;
@@ -413,9 +407,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
            Optional<Pip> pipOptional,

            Optional<DesktopMode> desktopModeOptional,

            FalsingManager falsingManager,

            Provider<NavigationBarEdgePanel> navigationBarEdgePanelProvider,

            Provider<BackGestureTfClassifierProvider> backGestureTfClassifierProviderProvider,

            FeatureFlags featureFlags,

            Provider<LightBarController> lightBarControllerProvider) {

        mContext = context;

        mDisplayId = context.getDisplayId();
@@ -435,13 +427,9 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
        mPipOptional = pipOptional;

        mDesktopModeOptional = desktopModeOptional;

        mFalsingManager = falsingManager;

        mNavBarEdgePanelProvider = navigationBarEdgePanelProvider;

        mBackGestureTfClassifierProviderProvider = backGestureTfClassifierProviderProvider;

        mFeatureFlags = featureFlags;

        mLightBarControllerProvider = lightBarControllerProvider;

        mLastReportedConfig.setTo(mContext.getResources().getConfiguration());

        mIsTrackpadGestureFeaturesEnabled = mFeatureFlags.isEnabled(

                Flags.TRACKPAD_GESTURE_FEATURES);

        ComponentName recentsComponentName = ComponentName.unflattenFromString(

                context.getString(com.android.internal.R.string.config_recentsComponentName));

        if (recentsComponentName != null) {
@@ -559,13 +547,11 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
        mIsAttached = true;

        mOverviewProxyService.addCallback(mQuickSwitchListener);

        mSysUiState.addCallback(mSysUiStateCallback);

        if (mIsTrackpadGestureFeaturesEnabled) {

        mInputManager.registerInputDeviceListener(mInputDeviceListener, mMainHandler);

        int [] inputDevices = mInputManager.getInputDeviceIds();

        for (int inputDeviceId : inputDevices) {

            mInputDeviceListener.onInputDeviceAdded(inputDeviceId);

        }

        }

        updateIsEnabled();

        mUserTracker.addCallback(mUserChangedCallback, mMainExecutor);

    }
@@ -616,8 +602,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
        try {

            Trace.beginSection("EdgeBackGestureHandler#updateIsEnabled");



            mIsGestureHandlingEnabled =

                    mInGestureNavMode || (mIsTrackpadGestureFeaturesEnabled && mUsingThreeButtonNav

            mIsGestureHandlingEnabled = mInGestureNavMode || (mUsingThreeButtonNav

                    && mIsTrackpadConnected);

            boolean isEnabled = mIsAttached && mIsGestureHandlingEnabled;

            if (isEnabled == mIsEnabled) {
@@ -678,7 +663,6 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
                        Choreographer.getInstance(), this::onInputEvent);



                // Add a nav bar panel window

                mIsNewBackAffordanceEnabled = mFeatureFlags.isEnabled(Flags.NEW_BACK_AFFORDANCE);

                resetEdgeBackPlugin();

                mPluginManager.addPluginListener(

                        this, NavigationEdgeBackPlugin.class, /*allowMultiple=*/ false);
@@ -701,12 +685,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
    }



    private void resetEdgeBackPlugin() {

        if (mIsNewBackAffordanceEnabled) {

            setEdgeBackPlugin(

                    mBackPanelControllerFactory.create(mContext));

        } else {

            setEdgeBackPlugin(mNavBarEdgePanelProvider.get());

        }

        setEdgeBackPlugin(mBackPanelControllerFactory.create(mContext));

    }



    private void setEdgeBackPlugin(NavigationEdgeBackPlugin edgeBackPlugin) {
@@ -1001,8 +980,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
                Log.d(DEBUG_MISSING_GESTURE_TAG, "Start gesture: " + ev);

            }



            mIsTrackpadThreeFingerSwipe = isTrackpadThreeFingerSwipe(

                    mIsTrackpadGestureFeaturesEnabled, ev);

            mIsTrackpadThreeFingerSwipe = isTrackpadThreeFingerSwipe(ev);



            // ACTION_UP or ACTION_CANCEL is not guaranteed to be called before a new

            // ACTION_DOWN, in that case we should just reuse the old instance.
@@ -1027,7 +1005,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
                    && !mGestureBlockingActivityRunning.get()

                    && !QuickStepContract.isBackGestureDisabled(mSysUiFlags,

                            mIsTrackpadThreeFingerSwipe)

                    && !isTrackpadScroll(mIsTrackpadGestureFeaturesEnabled, ev);

                    && !isTrackpadScroll(ev);

            if (mIsTrackpadThreeFingerSwipe) {

                // Trackpad back gestures don't have zones, so we don't need to check if the down

                // event is within insets.
@@ -1321,10 +1299,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
        private final Optional<Pip> mPipOptional;

        private final Optional<DesktopMode> mDesktopModeOptional;

        private final FalsingManager mFalsingManager;

        private final Provider<NavigationBarEdgePanel> mNavBarEdgePanelProvider;

        private final Provider<BackGestureTfClassifierProvider>

                mBackGestureTfClassifierProviderProvider;

        private final FeatureFlags mFeatureFlags;

        private final Provider<LightBarController> mLightBarControllerProvider;



        @Inject
@@ -1344,10 +1320,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
                       Optional<Pip> pipOptional,

                       Optional<DesktopMode> desktopModeOptional,

                       FalsingManager falsingManager,

                       Provider<NavigationBarEdgePanel> navBarEdgePanelProvider,

                       Provider<BackGestureTfClassifierProvider>

                               backGestureTfClassifierProviderProvider,

                       FeatureFlags featureFlags,

                       Provider<LightBarController> lightBarControllerProvider) {

            mOverviewProxyService = overviewProxyService;

            mSysUiState = sysUiState;
@@ -1365,9 +1339,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
            mPipOptional = pipOptional;

            mDesktopModeOptional = desktopModeOptional;

            mFalsingManager = falsingManager;

            mNavBarEdgePanelProvider = navBarEdgePanelProvider;

            mBackGestureTfClassifierProviderProvider = backGestureTfClassifierProviderProvider;

            mFeatureFlags = featureFlags;

            mLightBarControllerProvider = lightBarControllerProvider;

        }
@@ -1391,9 +1363,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
                    mPipOptional,

                    mDesktopModeOptional,

                    mFalsingManager,

                    mNavBarEdgePanelProvider,

                    mBackGestureTfClassifierProviderProvider,

                    mFeatureFlags,

                    mLightBarControllerProvider);

        }

    }

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java

deleted100644 → 0
+0 −944

File deleted.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/Utilities.java

+4 −8
Original line number Diff line number Diff line
@@ -24,16 +24,12 @@ import android.view.MotionEvent; 


public final class Utilities {



    public static boolean isTrackpadScroll(boolean isTrackpadGestureFeaturesEnabled,

            MotionEvent event) {

        return isTrackpadGestureFeaturesEnabled

                && event.getClassification() == CLASSIFICATION_TWO_FINGER_SWIPE;

    public static boolean isTrackpadScroll(MotionEvent event) {

        return event.getClassification() == CLASSIFICATION_TWO_FINGER_SWIPE;

    }



    public static boolean isTrackpadThreeFingerSwipe(boolean isTrackpadGestureFeaturesEnabled,

            MotionEvent event) {

        return isTrackpadGestureFeaturesEnabled

                && event.getClassification() == CLASSIFICATION_MULTI_FINGER_SWIPE

    public static boolean isTrackpadThreeFingerSwipe(MotionEvent event) {

        return event.getClassification() == CLASSIFICATION_MULTI_FINGER_SWIPE

                && event.getAxisValue(AXIS_GESTURE_SWIPE_FINGER_COUNT) == 3;

    }

}

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+5 −9
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
     */



    public final boolean mAnimateBack;

    private final boolean mTrackpadGestureFeaturesEnabled;

    /**

     * The minimum scale to "squish" the Shade and associated elements down to, for Back gesture

     */
@@ -891,7 +890,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        mLayoutInflater = layoutInflater;

        mFeatureFlags = featureFlags;

        mAnimateBack = predictiveBackAnimateShade();

        mTrackpadGestureFeaturesEnabled = mFeatureFlags.isEnabled(Flags.TRACKPAD_GESTURE_FEATURES);

        mFalsingCollector = falsingCollector;

        mWakeUpCoordinator = coordinator;

        mMainDispatcher = mainDispatcher;
@@ -4925,9 +4923,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
            final float x = event.getX(pointerIndex);

            final float y = event.getY(pointerIndex);

            boolean canCollapsePanel = canCollapsePanelOnTouch();

            final boolean isTrackpadTwoOrThreeFingerSwipe = isTrackpadScroll(

                    mTrackpadGestureFeaturesEnabled, event) || isTrackpadThreeFingerSwipe(

                    mTrackpadGestureFeaturesEnabled, event);

            final boolean isTrackpadTwoOrThreeFingerSwipe = isTrackpadScroll(event)

                    || isTrackpadThreeFingerSwipe(event);



            switch (event.getActionMasked()) {

                case MotionEvent.ACTION_DOWN:
@@ -4947,7 +4944,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 


                    mIsTrackpadReverseScroll =

                            !mNaturalScrollingSettingObserver.isNaturalScrollingEnabled()

                                    && isTrackpadScroll(mTrackpadGestureFeaturesEnabled, event);

                                    && isTrackpadScroll(event);

                    if (!isTracking() || isFullyCollapsed()) {

                        mInitialExpandY = y;

                        mInitialExpandX = x;
@@ -5170,9 +5167,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                mIgnoreXTouchSlop = true;

            }



            final boolean isTrackpadTwoOrThreeFingerSwipe = isTrackpadScroll(

                    mTrackpadGestureFeaturesEnabled, event) || isTrackpadThreeFingerSwipe(

                    mTrackpadGestureFeaturesEnabled, event);

            final boolean isTrackpadTwoOrThreeFingerSwipe = isTrackpadScroll(event)

                    || isTrackpadThreeFingerSwipe(event);



            switch (event.getActionMasked()) {

                case MotionEvent.ACTION_DOWN: