commit 78403d79739605511ea88b653564d81d7bf4bbba
author Chris Wren <cwren@android.com> Mon Jul 28 10:23:24 2014 +0100
committer Chris Wren <cwren@android.com> Wed Jul 30 14:47:13 2014 +0000
tree ee39ecaa12cca9f9203d834098c697624e651c48
parent 29762c3dfb7a510c23f021f6797840ebd80663af

Add a log and statistics for notification expansion.

Bug: 16618854
Change-Id: I501f396fa495e1e55a27d7d0b65aac66495418c1

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index e042a53..4b0af11 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -54,6 +54,12 @@
     private int mMaxExpandHeight;
     private View mVetoButton;
     private boolean mClearable;
+    private ExpansionLogger mLogger;
+    private String mLoggingKey;
+
+    public interface ExpansionLogger {
+        public void logNotificationExpansion(String key, boolean userAction, boolean expanded);
+    }
 
     public ExpandableNotificationRow(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -66,6 +72,7 @@
     public void reset() {
         super.reset();
         mRowMinHeight = 0;
+        final boolean wasExpanded = isExpanded();
         mRowMaxHeight = 0;
         mExpandable = false;
         mHasUserChangedExpansion = false;
@@ -76,6 +83,7 @@
         mPublicLayout.reset();
         mPrivateLayout.reset();
         mMaxExpandHeight = 0;
+        logExpansionEvent(false, wasExpanded);
     }
 
     @Override
@@ -131,8 +139,10 @@
      */
     public void setUserExpanded(boolean userExpanded) {
         if (userExpanded && !mExpandable) return;
+        final boolean wasExpanded = isExpanded();
         mHasUserChangedExpansion = true;
         mUserExpanded = userExpanded;
+        logExpansionEvent(true, wasExpanded);
     }
 
     public boolean isUserLocked() {
@@ -156,15 +166,19 @@
      * @param expand whether the system wants this notification to be expanded.
      */
     public void setSystemExpanded(boolean expand) {
+        final boolean wasExpanded = isExpanded();
         mIsSystemExpanded = expand;
         notifyHeightChanged();
+        logExpansionEvent(false, wasExpanded);
     }
 
     /**
      * @param expansionDisabled whether to prevent notification expansion
      */
     public void setExpansionDisabled(boolean expansionDisabled) {
+        final boolean wasExpanded = isExpanded();
         mExpansionDisabled = expansionDisabled;
+        logExpansionEvent(false, wasExpanded);
         notifyHeightChanged();
     }
 
@@ -302,4 +316,17 @@
     private NotificationContentView getShowingLayout() {
         return mShowingPublic ? mPublicLayout : mPrivateLayout;
     }
+
+    public void setExpansionLogger(ExpansionLogger logger, String key) {
+        mLogger = logger;
+        mLoggingKey = key;
+    }
+
+
+    private void logExpansionEvent(boolean userAction, boolean wasExpanded) {
+        final boolean nowExpanded = isExpanded();
+        if (wasExpanded != nowExpanded && mLogger != null) {
+            mLogger.logNotificationExpansion(mLoggingKey, userAction, nowExpanded) ;
+        }
+    }
 }