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

Commit e85a5687 authored by Sebastiano Poggi's avatar Sebastiano Poggi Committed by Joey Rizzoli
Browse files

Avoid dismissing headsup notifications on swipe up 

From https://groups.google.com/forum/m/?fromgroups#!topic/android-contrib/CU4eYkApZx0



Change-Id: I8861005838ba125f476814b375613c4f25a9c4d6
Signed-off-by: default avatarlinuxx <joey@cyanogenmoditalia.it>
parent 6a4fafdd

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+7 −2
Original line number Diff line number Diff line
@@ -3678,8 +3678,13 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        mHeadsUpNotificationView.setVisibility(vis ? View.VISIBLE : View.GONE);

    }



    public void onHeadsUpDismissed() {

    public void onHeadsUpDismissed(int direction) {

        if (direction == HeadsUpNotificationView.DIRECTION_X) {

             mHeadsUpNotificationView.dismiss();

        } else if (direction == HeadsUpNotificationView.DIRECTION_Y) {

             mHeadsUpNotificationView.release();

             scheduleHeadsUpClose();

        }

    }



    private static void copyNotifications(ArrayList<Pair<String, StatusBarNotification>> dest,

packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java

+5 −2
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper. 
    private static final boolean DEBUG = false;

    private static final boolean SPEW = DEBUG;



    public static final int DIRECTION_X = 0;

    public static final int DIRECTION_Y = 1;



    Rect mTmpRect = new Rect();

    int[] mTmpTwoArray = new int[2];
@@ -323,7 +326,7 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper. 
    @Override

    public void onChildDismissed(View v) {

        Log.v(TAG, "User swiped heads up to dismiss");

        mBar.onHeadsUpDismissed();

        mBar.onHeadsUpDismissed(DIRECTION_X);

    }



    @Override
@@ -406,7 +409,7 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper. 
                        }

                        if (dY < 0) {

                            if (DEBUG_EDGE_SWIPE) Log.d(TAG, "found a close");

                            mBar.onHeadsUpDismissed();

                            mBar.onHeadsUpDismissed(DIRECTION_Y);

                        }

                        mConsuming = true;

                    }