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

Commit 34eda5ed authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed a clicking bug on the lockscreen 

Parts of custom notficications were not singeclickable

Bug: 27247884
Change-Id: I7c52500a77929059b24e8119f50492e0f1399401
parent 03eb3b7c

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

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

    }



    private NotificationHeaderView getVisibleNotificationHeader() {

        if (mNotificationHeader != null) {

            return mNotificationHeader;

        }

        return getShowingLayout().getVisibleNotificationHeader();

    }



    public void setOnExpandClickListener(OnExpandClickListener onExpandClickListener) {

        mOnExpandClickListener = onExpandClickListener;

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

        float x = event.getX();

        float y = event.getY();

        NotificationHeaderView header = getNotificationHeader();

        NotificationHeaderView header = getVisibleNotificationHeader();

        if (header != null) {

            return header.isInTouchRect(x, y);

        }

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

+18 −0
Original line number 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

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

    }



    public NotificationHeaderView getVisibleNotificationHeader() {

        NotificationViewWrapper wrapper = getCurrentVisibleWrapper();

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

    }



    public void setContainingNotification(ExpandableNotificationRow containingNotification) {

        mContainingNotification = containingNotification;

    }