Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4639949 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 38883bdd: am 4eada647: Merge "Only show the bouncer for the assistant if... 

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

* commit '38883bdd':
  Only show the bouncer for the assistant if secure.
parents 18048411 38883bdd

policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java

+10 −0
Original line number Diff line number Diff line
@@ -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

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

+2 −13
Original line number Diff line number Diff line
@@ -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);

    }

}