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

resolve merge conflicts of cd9ea74 to nyc-mr1-dev

Browse Source 
Change-Id: I37bc8256b8b91274f418cbefe2797f068cd98dd4
This commit is contained in:
Chris Wren
2016-05-27 13:34:02 -04:00
parent 05e0a9f3cf cd9ea74659
commit 7ee8418076
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
View File

@@ -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
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -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 {

6
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -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
proto/src/metrics_constants.proto
View File

@@ -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 -----