diff options
| author | Danesh Mondegarian <daneshm90@gmail.com> | 2013-03-30 08:54:07 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-03-30 08:54:07 -0700 |
| commit | 6a33b50cc989e75c70c4f9eea4fd92f1d10dacd7 (patch) | |
| tree | 31f37dde47c7b01b1c33847d41e3a67f1ab2379b /policy | |
| parent | 068ffb8c558ae80194fe98e019d4fbee4721ae5c (diff) | |
| parent | 1d73b97eb5cf1588ec660f7f942c1c392009800e (diff) | |
| download | frameworks_base-6a33b50cc989e75c70c4f9eea4fd92f1d10dacd7.zip frameworks_base-6a33b50cc989e75c70c4f9eea4fd92f1d10dacd7.tar.gz frameworks_base-6a33b50cc989e75c70c4f9eea4fd92f1d10dacd7.tar.bz2 | |
Merge "LockscreenTargets : Dismiss on target select" into cm-10.1
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java | 2 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java index 4c19caa..8605124 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java @@ -197,7 +197,7 @@ public abstract class KeyguardActivityLauncher { } } - private void dismissKeyguardOnNextActivity() { + protected void dismissKeyguardOnNextActivity() { try { ActivityManagerNative.getDefault().dismissKeyguardOnNextActivity(); } catch (RemoteException e) { diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java index 924e514..52d62fb 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java @@ -180,6 +180,11 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri } @Override + protected void dismissKeyguardOnNextActivity() { + getCallback().dismiss(false); + } + + @Override Context getContext() { return mContext; }}; |