Clean up user activity handling

- Only call userActivity in down touch event
- Use normal timeout when QS is open
- Clean up old code regarding user activity in Keyguard

Change-Id: I968eeed33fef44def37b68eb1ddc63f1a531ab35

1 files changed, 4 insertions, 4 deletions

diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
index 382cbec..7727e4a 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -47,7 +47,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
     // Used to notify the container when something interesting happens.
     public interface SecurityCallback {
         public boolean dismiss(boolean authenticated);
-        public void userActivity(long timeout);
+        public void userActivity();
         public void onSecurityModeChanged(SecurityMode securityMode, boolean needsInput);
         public void finish();
     }
@@ -419,9 +419,9 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
 
     private KeyguardSecurityCallback mCallback = new KeyguardSecurityCallback() {
 
-        public void userActivity(long timeout) {
+        public void userActivity() {
             if (mSecurityCallback != null) {
-                mSecurityCallback.userActivity(timeout);
+                mSecurityCallback.userActivity();
             }
         }
 
@@ -459,7 +459,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
     // state for the current security method.
     private KeyguardSecurityCallback mNullCallback = new KeyguardSecurityCallback() {
         @Override
-        public void userActivity(long timeout) { }
+        public void userActivity() { }
         @Override
         public void showBackupSecurity() { }
         @Override