diff options
| author | Danesh Mondegarian <daneshm90@gmail.com> | 2013-03-27 20:48:13 -0400 |
|---|---|---|
| committer | Danesh Mondegarian <daneshm90@gmail.com> | 2013-03-27 20:49:51 -0400 |
| commit | 1d73b97eb5cf1588ec660f7f942c1c392009800e (patch) | |
| tree | e8cc2f994c5591f2434781c56db5c8351aef5c8c /policy/src | |
| parent | 719327fc94e3324c789a29c07c731fc8f385f0f8 (diff) | |
| download | frameworks_base-1d73b97eb5cf1588ec660f7f942c1c392009800e.zip frameworks_base-1d73b97eb5cf1588ec660f7f942c1c392009800e.tar.gz frameworks_base-1d73b97eb5cf1588ec660f7f942c1c392009800e.tar.bz2 | |
LockscreenTargets : Dismiss on target select
Only dismiss prior to activity launch for lockscreen shortcuts,
camera and appwidget picker remain untouched.
Change-Id: I2770c628ce0708570aa6ea0eac9e3cd1d82287fb
Diffstat (limited to 'policy/src')
| -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; }}; |