Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 38883bdd: am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev

Browse Source 
* commit '38883bdd0088277771efca72c80e33773408d72e':
  Only show the bouncer for the assistant if secure.
This commit is contained in:
Daniel Sandler
2012-11-08 13:13:49 -08:00
committed by Android Git Automerger
parent 180484115f 38883bdd00
commit c4639949d2
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java
View File

@@ -151,9 +151,19 @@ public abstract class KeyguardActivityLauncher {
boolean useDefaultAnimations,
final Handler worker,
final Runnable onStarted) {
final Context context = getContext();
final Bundle animation = useDefaultAnimations ? null
: ActivityOptions.makeCustomAnimation(context, 0, 0).toBundle();
launchActivityWithAnimation(intent, showsWhileLocked, animation, worker, onStarted);
}
public void launchActivityWithAnimation(final Intent intent,
boolean showsWhileLocked,
final Bundle animation,
final Handler worker,
final Runnable onStarted) {
LockPatternUtils lockPatternUtils = getLockPatternUtils();
intent.addFlags(
Intent.FLAG_ACTIVITY_NEW_TASK

15
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
View File

@@ -1501,19 +1501,8 @@ public class KeyguardHostView extends KeyguardViewBase {
getHandler(), null);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
setOnDismissAction(new OnDismissAction() {
@Override
public boolean onDismiss() {
try {
mContext.startActivityAsUser(intent, opts.toBundle(),
new UserHandle(UserHandle.USER_CURRENT));
} catch (ActivityNotFoundException e) {
Slog.w(TAG, "Activity not found for " + intent.getAction());
}
return false;
}
});
mViewStateManager.showBouncer(true);
mActivityLauncher.launchActivityWithAnimation(
intent, false, opts.toBundle(), null, null);
}
}