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

Commit 17f9fe13 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1

parents 3e7b412d 5e6af448
Loading
Loading
Loading
Loading
+20 −15
Original line number Diff line number Diff line
@@ -2188,6 +2188,11 @@ public class PhoneStatusBar extends StatusBar {

    private View.OnClickListener mSettingsButtonListener = new View.OnClickListener() {
        public void onClick(View v) {
            try {
                // Dismiss the lock screen when Settings starts.
                ActivityManagerNative.getDefault().dismissKeyguardOnNextActivity();
            } catch (RemoteException e) {
            }
            v.getContext().startActivity(new Intent(Settings.ACTION_SETTINGS)
                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
            animateCollapse();