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

Commit 4e0b58be authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed a clicking bug on the lockscreen" into nyc-dev 

am: e961f32b

* commit 'e961f32b':
  Fixed a clicking bug on the lockscreen
parents 147ad168 e961f32b

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

+8 −1
Original line number Original line Diff line number Diff line
@@ -519,6 +519,13 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
        return mPrivateLayout.getNotificationHeader();

        return mPrivateLayout.getNotificationHeader();

    }

    }





    private NotificationHeaderView getVisibleNotificationHeader() {

        if (mNotificationHeader != null) {

            return mNotificationHeader;

        }

        return getShowingLayout().getVisibleNotificationHeader();

    }



    public void setOnExpandClickListener(OnExpandClickListener onExpandClickListener) {

    public void setOnExpandClickListener(OnExpandClickListener onExpandClickListener) {

        mOnExpandClickListener = onExpandClickListener;

        mOnExpandClickListener = onExpandClickListener;

    }

    }
@@ -1293,7 +1300,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
    protected boolean disallowSingleClick(MotionEvent event) {

    protected boolean disallowSingleClick(MotionEvent event) {

        float x = event.getX();

        float x = event.getX();

        float y = event.getY();

        float y = event.getY();

        NotificationHeaderView header = getNotificationHeader();

        NotificationHeaderView header = getVisibleNotificationHeader();

        if (header != null) {

        if (header != null) {

            return header.isInTouchRect(x, y);

            return header.isInTouchRect(x, y);

        }

        }

packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java

+18 −0
Original line number Original line Diff line number Diff line
@@ -475,6 +475,19 @@ public class NotificationContentView extends FrameLayout { 
        }

        }

    }

    }





    private NotificationViewWrapper getCurrentVisibleWrapper() {

        switch (mVisibleType) {

            case VISIBLE_TYPE_EXPANDED:

                return mExpandedWrapper;

            case VISIBLE_TYPE_HEADSUP:

                return mHeadsUpWrapper;

            case VISIBLE_TYPE_CONTRACTED:

                return mContractedWrapper;

            default:

                return null;

        }

    }



    /**

    /**

     * @return one of the static enum types in this view, calculated form the current state

     * @return one of the static enum types in this view, calculated form the current state

     */

     */
@@ -684,6 +697,11 @@ public class NotificationContentView extends FrameLayout { 
        return header;

        return header;

    }

    }





    public NotificationHeaderView getVisibleNotificationHeader() {

        NotificationViewWrapper wrapper = getCurrentVisibleWrapper();

        return wrapper == null ? null : wrapper.getNotificationHeader();

    }



    public void setContainingNotification(ExpandableNotificationRow containingNotification) {

    public void setContainingNotification(ExpandableNotificationRow containingNotification) {

        mContainingNotification = containingNotification;

        mContainingNotification = containingNotification;

    }

    }