summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2013-09-30 16:16:24 -0700
committerAdam Powell <adamp@google.com>2013-10-03 14:55:18 -0700
commitf8895248e2ac4dbb46622f3e04c7256f03175b4f (patch)
tree191c1c11a865e2ac3bc4fe2ba51ebbae387320b0 /packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
parent95867a652410b5f0193cf301f5737381bcbd3a88 (diff)
downloadframeworks_base-f8895248e2ac4dbb46622f3e04c7256f03175b4f.zip
frameworks_base-f8895248e2ac4dbb46622f3e04c7256f03175b4f.tar.gz
frameworks_base-f8895248e2ac4dbb46622f3e04c7256f03175b4f.tar.bz2
Add a scrubber to keyguard; layout tweaks
Switch KeyguardTransportControlView over to using RemoteController instead of the internal API. Guard transition animations behind a flag until we can work out some intermittent issues. Change-Id: Ie9f41339ce6e735c5d524db88437672f2c9859e2
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
index bc8c866..63aab4d 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
@@ -134,6 +134,10 @@ public class KeyguardHostView extends KeyguardViewBase {
void userActivity();
}
+ interface TransportControlCallback {
+ void userActivity();
+ }
+
/*package*/ interface OnDismissAction {
/* returns true if the dismiss should be deferred */
boolean onDismiss();
@@ -1222,6 +1226,11 @@ public class KeyguardHostView extends KeyguardViewBase {
LayoutInflater inflater = LayoutInflater.from(mContext);
mTransportControl = (KeyguardTransportControlView)
inflater.inflate(R.layout.keyguard_transport_control_view, this, false);
+ mTransportControl.setTransportControlCallback(new TransportControlCallback() {
+ public void userActivity() {
+ mViewMediatorCallback.userActivity();
+ }
+ });
}
return mTransportControl;
}