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

Commit 63b24443 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am a3e3c4dd: am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching... 

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

* commit 'a3e3c4dd':
  Fix 5705837: Dismiss keyguard when launching Settings from Statusbar
parents 419204c8 a3e3c4dd

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+20 −15
Original line number Original line Diff line number Diff line
@@ -2188,6 +2188,11 @@ public class PhoneStatusBar extends StatusBar { 




    private View.OnClickListener mSettingsButtonListener = new View.OnClickListener() {

    private View.OnClickListener mSettingsButtonListener = new View.OnClickListener() {

        public void onClick(View v) {

        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)

            v.getContext().startActivity(new Intent(Settings.ACTION_SETTINGS)

                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));

                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));

            animateCollapse();

            animateCollapse();