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

Commit 7c0bd203 authored by Chris Wren's avatar Chris Wren Committed by android-build-merger
Browse files

resolve merge conflicts of cd9ea746 to nyc-mr1-dev am: 7ee84180 

am: 318f923e

* commit '318f923e':
  add metrics for gestural notification expansions

Change-Id: Ia7b0decd5601195cd3eaddf09c5c460a8b3364a0
parents 09c66122 318f923e

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

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+6 −0
Original line number Diff line number Diff line
@@ -4346,6 +4346,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()) {
@@ -4356,6 +4358,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 {

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

+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);

        }

    }

proto/src/metrics_constants.proto

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