Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Make Notification long clickable"" into tm-qpr-dev

Browse Source
This commit is contained in:
Ibrahim Yilmaz
2023-02-06 21:50:21 +00:00
committed by Android (Google) Code Review
parent c93bbad0df 51f8ca7a49
commit 324457d58a
2 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -591,7 +591,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
} }
mShowingPublicInitialized = false; mShowingPublicInitialized = false;
updateNotificationColor(); updateNotificationColor();
updateLongClickable();
if (mMenuRow != null) { if (mMenuRow != null) {
mMenuRow.onNotificationUpdated(mEntry.getSbn()); mMenuRow.onNotificationUpdated(mEntry.getSbn());
mMenuRow.setAppName(mAppName); mMenuRow.setAppName(mAppName);
@@ -1197,26 +1196,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
return getShowingLayout().getVisibleWrapper(); 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) { public void setLongPressListener(LongPressListener longPressListener) {
mLongPressListener = longPressListener; mLongPressListener = longPressListener;
updateLongClickable();
} }
public void setDragController(ExpandableNotificationRowDragController dragController) { public void setDragController(ExpandableNotificationRowDragController dragController) {
@@ -2063,13 +2044,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
void onGutsOpened() { void onGutsOpened() {
resetTranslation(); resetTranslation();
updateContentAccessibilityImportanceForGuts(false /* isEnabled */); updateContentAccessibilityImportanceForGuts(false /* isEnabled */);
updateLongClickable();
} }
void onGutsClosed() { void onGutsClosed() {
updateContentAccessibilityImportanceForGuts(true /* isEnabled */); updateContentAccessibilityImportanceForGuts(true /* isEnabled */);
mIsSnoozed = false; mIsSnoozed = false;
updateLongClickable();
} }
/** /**
@@ -2968,10 +2947,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
return (mGuts != null && mGuts.isExposed()); return (mGuts != null && mGuts.isExposed());
} }
private boolean isGutsLeaveBehind() {
return (mGuts != null && mGuts.isLeavebehind());
}
@Override @Override
public boolean isContentExpandable() { public boolean isContentExpandable() {
if (mIsSummaryWithChildren && !shouldShowPublic()) { if (mIsSummaryWithChildren && !shouldShowPublic()) {

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

@@ -586,9 +586,7 @@ public class NotificationGutsManager implements NotifGutsViewManager {
} }
final ExpandableNotificationRow row = (ExpandableNotificationRow) view; final ExpandableNotificationRow row = (ExpandableNotificationRow) view;
if (view.isLongClickable()) {
view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
}
if (row.areGutsExposed()) { if (row.areGutsExposed()) {
closeAndSaveGuts(false /* removeLeavebehind */, false /* force */, closeAndSaveGuts(false /* removeLeavebehind */, false /* force */,
true /* removeControls */, -1 /* x */, -1 /* y */, true /* removeControls */, -1 /* x */, -1 /* y */,