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

Commit 5889106b authored by Justin Weir's avatar Justin Weir
Browse files

Rename the disable_shade_expands_on_trackpad_two_finger_swipe flag 

This flag was originally submitted without the bug fix metadata, and
the only way to fix the problem is to rename it.

Test: building and running automated tests is sufficient
Bug: 371224114
Flag: com.android.systemui.disable_shade_trackpad_two_finger_swipe
Change-Id: Icfaa279167432fe283b70d058d9fcc7accac9ff4
parent a1c4f56a

packages/SystemUI/aconfig/systemui.aconfig

+10 −10
Original line number Original line Diff line number Diff line
@@ -1805,16 +1805,6 @@ flag { 
  bug: "371224114"

  bug: "371224114"

}

}





flag {

  name: "disable_shade_expands_on_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 {

flag {

    name: "keyboard_shortcut_helper_shortcut_customizer"

    name: "keyboard_shortcut_helper_shortcut_customizer"

    namespace: "systemui"

    namespace: "systemui"
@@ -1915,6 +1905,16 @@ flag { 
   bug: "382531177"

   bug: "382531177"

}

}





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 {

flag {

   name: "notification_magic_actions_treatment"

   name: "notification_magic_actions_treatment"

   namespace: "systemui"

   namespace: "systemui"

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -3960,7 +3960,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
            }

            }





            final boolean isTrackpadThreeFingerSwipe = isTrackpadThreeFingerSwipe(event);

            final boolean isTrackpadThreeFingerSwipe = isTrackpadThreeFingerSwipe(event);

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

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

                    && !isTrackpadThreeFingerSwipe && isTwoFingerSwipeTrackpadEvent(event)

                    && !isTrackpadThreeFingerSwipe && isTwoFingerSwipeTrackpadEvent(event)

                    && !isPanelExpanded()) {

                    && !isPanelExpanded()) {

                if (isDown) {

                if (isDown) {