diff options
| author | Jim Miller <jaggies@google.com> | 2013-09-19 18:36:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-19 18:36:57 -0700 |
| commit | f3d1ef00c571657bd0464d157905c6b4fae2136f (patch) | |
| tree | 8727647ced5f5265350371daebe93cde70e87b72 /policy | |
| parent | c0e1ae0176b2ce23ea1b19883507cd920712289a (diff) | |
| parent | af638c4f9daa74b4c8e0905f07e11290f6845abe (diff) | |
| download | frameworks_base-f3d1ef00c571657bd0464d157905c6b4fae2136f.zip frameworks_base-f3d1ef00c571657bd0464d157905c6b4fae2136f.tar.gz frameworks_base-f3d1ef00c571657bd0464d157905c6b4fae2136f.tar.bz2 | |
am af638c4f: Merge "Add camera affordance to navigation bar on phones" into klp-dev
* commit 'af638c4f9daa74b4c8e0905f07e11290f6845abe':
Add camera affordance to navigation bar on phones
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java | 6 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java index 874076a..56a282b 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java @@ -29,8 +29,10 @@ import com.android.internal.widget.LockPatternUtils; * local or remote instances of keyguard. */ public class KeyguardServiceDelegate { - private static final String KEYGUARD_PACKAGE = "com.android.keyguard"; - private static final String KEYGUARD_CLASS = "com.android.keyguard.KeyguardService"; + // TODO: propagate changes to these to {@link KeyguardTouchDelegate} + public static final String KEYGUARD_PACKAGE = "com.android.keyguard"; + public static final String KEYGUARD_CLASS = "com.android.keyguard.KeyguardService"; + private static final String TAG = "KeyguardServiceDelegate"; private static final boolean DEBUG = true; protected KeyguardServiceWrapper mKeyguardService; diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java index 6b9c7df..b27584d 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java @@ -20,6 +20,7 @@ import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; import android.util.Slog; +import android.view.MotionEvent; import com.android.internal.policy.IKeyguardShowCallback; import com.android.internal.policy.IKeyguardExitCallback; @@ -187,6 +188,10 @@ public class KeyguardServiceWrapper implements IKeyguardService { } } + public void dispatch(MotionEvent event) { + // Not used by PhoneWindowManager. See code in {@link NavigationBarView} + } + @Override public IBinder asBinder() { return mService.asBinder(); |