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

Commit 2fe3ab2f authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz Committed by Automerger Merge Worker
Browse files

Merge "Revert "Make Notification long clickable"" into tm-qpr-dev am: 324457d5 am: f892dca9 

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



Change-Id: I311124c35e4e0795a1adaa5f6dba4d4009a86881
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41153662 f892dca9

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

+0 −25
Original line number Diff line number Diff line
@@ -591,7 +591,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        }

        mShowingPublicInitialized = false;

        updateNotificationColor();

        updateLongClickable();

        if (mMenuRow != null) {

            mMenuRow.onNotificationUpdated(mEntry.getSbn());

            mMenuRow.setAppName(mAppName);
@@ -1197,26 +1196,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        return getShowingLayout().getVisibleWrapper();

    }



    private 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();

    }



    private void updateLongClickable() {

        setLongClickable(isNotificationRowLongClickable());

    }



    public void setLongPressListener(LongPressListener longPressListener) {

        mLongPressListener = longPressListener;

        updateLongClickable();

    }



    public void setDragController(ExpandableNotificationRowDragController dragController) {
@@ -2063,13 +2044,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    void onGutsOpened() {

        resetTranslation();

        updateContentAccessibilityImportanceForGuts(false /* isEnabled */);

        updateLongClickable();

    }



    void onGutsClosed() {

        updateContentAccessibilityImportanceForGuts(true /* isEnabled */);

        mIsSnoozed = false;

        updateLongClickable();

    }



    /**
@@ -2968,10 +2947,6 @@ 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()) {

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

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



        final ExpandableNotificationRow row = (ExpandableNotificationRow) view;

        if (view.isLongClickable()) {

        view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);

        }

        if (row.areGutsExposed()) {

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

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