Merge "Call userActivity when dismissing keyguard" into nyc-mr1-dev

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

@@ -1386,6 +1386,7 @@ public class KeyguardViewMediator extends SystemUI {
     public void keyguardDone(boolean authenticated) {
         Trace.beginSection("KeyguardViewMediator#keyguardDone");
         if (DEBUG) Log.d(TAG, "keyguardDone(" + authenticated +")");
+        userActivity();
         EventLog.writeEvent(70000, 2);
         Message msg = mHandler.obtainMessage(KEYGUARD_DONE, authenticated ? 1 : 0);
         mHandler.sendMessage(msg);
@@ -1643,6 +1644,7 @@ public class KeyguardViewMediator extends SystemUI {
         @Override
         public void run() {
             Trace.beginSection("KeyguardViewMediator.mKeyGuardGoingAwayRunnable");
+            if (DEBUG) Log.d(TAG, "keyguardGoingAway");
             try {
                 mStatusBarKeyguardViewManager.keyguardGoingAway();
 
@@ -1714,6 +1716,8 @@ public class KeyguardViewMediator extends SystemUI {
 
     private void handleStartKeyguardExitAnimation(long startTime, long fadeoutDuration) {
         Trace.beginSection("KeyguardViewMediator#handleStartKeyguardExitAnimation");
+        if (DEBUG) Log.d(TAG, "handleStartKeyguardExitAnimation startTime=" + startTime
+                + " fadeoutDuration=" + fadeoutDuration);
         synchronized (KeyguardViewMediator.this) {
 
             if (!mHiding) {