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

Commit cdca13c6 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix intent tile to unlock on launching activities" into mnc-dev

parents 6983752a ee43cdfa

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ public class QSPanel extends ViewGroup { 
            mDetailSettingsButton.setOnClickListener(new OnClickListener() {

                @Override

                public void onClick(View v) {

                    mHost.startSettingsActivity(settingsIntent);

                    mHost.startActivityDismissingKeyguard(settingsIntent);

                }

            });

packages/SystemUI/src/com/android/systemui/qs/QSTile.java

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ public abstract class QSTile<TState extends State> implements Listenable { 
    }



    public interface Host {

        void startSettingsActivity(Intent intent);

        void startActivityDismissingKeyguard(Intent intent);

        void warn(String message, Throwable t);

        void collapsePanels();

        Looper getLooper();

packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class CellularTile extends QSTile<QSTile.SignalState> { 
        if (mDataController.isMobileDataSupported()) {

            showDetail(true);

        } else {

            mHost.startSettingsActivity(CELLULAR_SETTINGS);

            mHost.startActivityDismissingKeyguard(CELLULAR_SETTINGS);

        }

    }

packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ public class DndTile extends QSTile<QSTile.BooleanState> { 
    private final ZenModePanel.Callback mZenModePanelCallback = new ZenModePanel.Callback() {

        @Override

        public void onPrioritySettings() {

            mHost.startSettingsActivity(ZEN_PRIORITY_SETTINGS);

            mHost.startActivityDismissingKeyguard(ZEN_PRIORITY_SETTINGS);

        }



        @Override

packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java

+5 −1
Original line number Diff line number Diff line
@@ -96,7 +96,11 @@ public class IntentTile extends QSTile<QSTile.State> { 
    private void sendIntent(String type, PendingIntent pi, String uri) {

        try {

            if (pi != null) {

                if (pi.isActivity()) {

                    getHost().startActivityDismissingKeyguard(pi.getIntent());

                } else {

                    pi.send();

                }

            } else if (uri != null) {

                final Intent intent = Intent.parseUri(uri, Intent.URI_INTENT_SCHEME);

                mContext.sendBroadcastAsUser(intent, new UserHandle(mCurrentUserId));