resolve merge conflicts of cd9ea74 to nyc-mr1-dev (7ee84180) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -1491,6 +1491,14 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
		mLoggingKey = key;
		}

		public void onExpandedByGesture(boolean userExpanded) {
		int event = MetricsEvent.ACTION_NOTIFICATION_GESTURE_EXPANDER;
		if (mGroupManager.isSummaryOfGroup(getStatusBarNotification())) {
		event = MetricsEvent.ACTION_NOTIFICATION_GROUP_GESTURE_EXPANDER;
		}
		MetricsLogger.action(mContext, event, userExpanded);
		}

		@Override
		public float getIncreasedPaddingAmount() {
		if (mIsSummaryWithChildren) {

+6 −0

Original line number	Diff line number	Diff line
		@@ -4337,6 +4337,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

		// ---------------------- DragDownHelper.OnDragDownListener ------------------------------------


		/* Only ever called as a consequence of a lockscreen expansion gesture. */
		@Override
		public boolean onDraggedDown(View startingChild, int dragLengthY) {
		if (hasActiveNotifications()) {
		@@ -4347,6 +4349,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

		// We have notifications, go to locked shade.
		goToLockedShade(startingChild);
		if (startingChild instanceof ExpandableNotificationRow) {
		ExpandableNotificationRow row = (ExpandableNotificationRow) startingChild;
		row.onExpandedByGesture(true /* drag down is always an open */);
		}
		return true;
		} else {

+4 −2

Original line number	Diff line number	Diff line
		@@ -959,11 +959,13 @@ public class NotificationStackScrollLayout extends ViewGroup
		&& (mIsExpanded \|\| !((ExpandableNotificationRow) v).isPinned());
		}

		/* Only ever called as a consequence of an expansion gesture in the shade. */
		@Override
		public void setUserExpandedChild(View v, boolean userExpanded) {
		if (v instanceof ExpandableNotificationRow) {
		((ExpandableNotificationRow) v).setUserExpanded(userExpanded,
		true /* allowChildrenExpansion */);
		ExpandableNotificationRow row = (ExpandableNotificationRow) v;
		row.setUserExpanded(userExpanded, true /* allowChildrenExpansion */);
		row.onExpandedByGesture(userExpanded);
		}
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -2212,6 +2212,13 @@ message MetricsEvent {
		// Notification group expansion state toggled by the expand affordance.
		ACTION_NOTIFICATION_GROUP_EXPANDER = 408;


		// Notification expansion state toggled by the expand gesture.
		ACTION_NOTIFICATION_GESTURE_EXPANDER = 409;

		// Notification group expansion state toggled by the expand gesture.
		ACTION_NOTIFICATION_GROUP_GESTURE_EXPANDER = 410;

		// ---- End N Constants, all N constants go above this line ----

		// ------- Begin N App Disambig Shade -----