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

Commit 666b602f authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz Committed by Automerger Merge Worker
Browse files

Merge "Make Notification long clickable" into tm-qpr-dev am: ae1b2e33 am: 8efc4ef4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21335160



Change-Id: I003259cf0becd38ccb52323c855e6512daf343f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34880984 8efc4ef4

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

+26 −1
Original line number Diff line number Diff line
@@ -1198,6 +1198,22 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        return getShowingLayout().getVisibleWrapper();

    }



    /**

     * @return whether the notification row is long clickable or not.

     */

    public boolean isNotificationRowLongClickable() {

        if (mLongPressListener == null) {

            return false;

        }



        if (!areGutsExposed()) { // guts is not opened

            return true;

        }



        // if it is leave behind, it shouldn't be long clickable.

        return !isGutsLeaveBehind();

    }



    public void setLongPressListener(LongPressListener longPressListener) {

        mLongPressListener = longPressListener;

    }
@@ -2954,6 +2970,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        return (mGuts != null && mGuts.isExposed());

    }



    private boolean isGutsLeaveBehind() {

        return (mGuts != null && mGuts.isLeavebehind());

    }



    @Override

    public boolean isContentExpandable() {

        if (mIsSummaryWithChildren && !shouldShowPublic()) {
@@ -3401,7 +3421,12 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    @Override

    public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfoInternal(info);

        final boolean isLongClickable = isNotificationRowLongClickable();

        if (isLongClickable) {

            info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_LONG_CLICK);

        }

        info.setLongClickable(isLongClickable);



        if (canViewBeDismissed() && !mIsSnoozed) {

            info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_DISMISS);

        }

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java

+3 −1
Original line number Diff line number Diff line
@@ -586,7 +586,9 @@ public class NotificationGutsManager implements NotifGutsViewManager { 
        }



        final ExpandableNotificationRow row = (ExpandableNotificationRow) view;

        if (row.isNotificationRowLongClickable()) {

            view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);

        }

        if (row.areGutsExposed()) {

            closeAndSaveGuts(false /* removeLeavebehind */, false /* force */,

                    true /* removeControls */, -1 /* x */, -1 /* y */,