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

Commit 1cfedff0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cleanup flag disable_shade_trackpad_two_finger_swipe" into main

parents 738a4ab7 8cfb8721

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -1682,16 +1682,6 @@ flag { 
    }

}



flag {

  name: "disable_shade_trackpad_two_finger_swipe"

  namespace: "systemui"

  description: "Disables expansion of the shade via two finger swipe on a trackpad"

  bug: "356804470"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

   name: "notification_animated_actions_treatment"

   namespace: "systemui"

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

+1 −3
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ import com.android.systemui.statusbar.policy.ConfigurationController; 
import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.statusbar.policy.SplitShadeStateController;

import com.android.systemui.unfold.SysUIUnfoldComponent;

import com.android.systemui.util.Compile;

import com.android.systemui.util.Utils;

import com.android.systemui.util.time.SystemClock;

import com.android.systemui.wallpapers.ui.viewmodel.WallpaperFocalAreaViewModel;
@@ -4100,8 +4099,7 @@ public final class NotificationPanelViewController implements 
            }



            final boolean isTrackpadThreeFingerSwipe = isTrackpadThreeFingerSwipe(event);

            if (com.android.systemui.Flags.disableShadeTrackpadTwoFingerSwipe()

                    && !isTrackpadThreeFingerSwipe && isTwoFingerSwipeTrackpadEvent(event)

            if (!isTrackpadThreeFingerSwipe && isTwoFingerSwipeTrackpadEvent(event)

                    && !isPanelExpanded()) {

                if (isDown) {

                    mShadeLog.d("ignoring down event for two finger trackpad swipe");