Merge "Move performDismiss utility method to ExpandableNotificationRow" (7e286aed) · Commits · e / os / android_frameworks_base

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

+14 −5

Original line number	Diff line number	Diff line
		@@ -1096,11 +1096,21 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		return mGroupParentWhenDismissed;
		}

		public void performDismiss() {
		public void performDismiss(boolean fromAccessibility) {
		if (mGroupManager.isOnlyChildInGroup(getStatusBarNotification())) {
		ExpandableNotificationRow groupSummary =
		mGroupManager.getLogicalGroupSummary(getStatusBarNotification());
		if (groupSummary.isClearable()) {
		groupSummary.performDismiss(fromAccessibility);
		}
		}
		setDismissed(true, fromAccessibility);
		if (isClearable()) {
		if (mOnDismissRunnable != null) {
		mOnDismissRunnable.run();
		}
		}
		}

		public void setOnDismissRunnable(Runnable onDismissRunnable) {
		mOnDismissRunnable = onDismissRunnable;
		@@ -2328,8 +2338,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		}
		switch (action) {
		case AccessibilityNodeInfo.ACTION_DISMISS:
		NotificationStackScrollLayout.performDismiss(this, mGroupManager,
		true /* fromAccessibility */);
		performDismiss(true /* fromAccessibility */);
		return true;
		case AccessibilityNodeInfo.ACTION_COLLAPSE:
		case AccessibilityNodeInfo.ACTION_EXPAND:

+3 −21

Original line number	Diff line number	Diff line
		@@ -1019,7 +1019,9 @@ public class NotificationStackScrollLayout extends ViewGroup
		mHeadsUpManager.addSwipedOutNotification(row.getStatusBarNotification().getKey());
		}
		}
		performDismiss(v, mGroupManager, false /* fromAccessibility */);
		if (v instanceof ExpandableNotificationRow) {
		((ExpandableNotificationRow) v).performDismiss(false /* fromAccessibility */);
		}

		mFalsingManager.onNotificationDismissed();
		if (mFalsingManager.shouldEnforceBouncer()) {
		@@ -1028,26 +1030,6 @@ public class NotificationStackScrollLayout extends ViewGroup
		}
		}

		public static void performDismiss(View v, NotificationGroupManager groupManager,
		boolean fromAccessibility) {
		if (!(v instanceof ExpandableNotificationRow)) {
		return;
		}
		ExpandableNotificationRow row = (ExpandableNotificationRow) v;
		if (groupManager.isOnlyChildInGroup(row.getStatusBarNotification())) {
		ExpandableNotificationRow groupSummary =
		groupManager.getLogicalGroupSummary(row.getStatusBarNotification());
		if (groupSummary.isClearable()) {
		performDismiss(groupSummary, groupManager, fromAccessibility);
		}
		}
		row.setDismissed(true, fromAccessibility);
		if (row.isClearable()) {
		row.performDismiss();
		}
		if (DEBUG) Log.v(TAG, "onChildDismissed: " + v);
		}

		@Override
		public void onChildSnappedBack(View animView, float targetLeft) {
		mAmbientState.onDragFinished(animView);