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

Commit 7110d80a authored by Cecilia Hong's avatar Cecilia Hong Committed by Automerger Merge Worker
Browse files

Merge "Tap a media reco from lock screen: - Open the media activity directly... 

Merge "Tap a media reco from lock screen: - Open the media activity directly in background to play; - Request to unlock the phone to open the media activity in foreground." into sc-dev am: a0eac6bb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14355243

Change-Id: I7b25ac3741c74e36f83e8a8006d5540a23fec175
parents f2eb924b a0eac6bb

packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java

+39 −4
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import com.android.systemui.shared.system.SysUiStatsLog; 
import com.android.systemui.statusbar.phone.KeyguardDismissUtil;

import com.android.systemui.util.animation.TransitionLayout;



import java.net.URISyntaxException;

import java.util.List;

import java.util.concurrent.Executor;
@@ -69,6 +70,9 @@ public class MediaControlPanel { 
    private static final String TAG = "MediaControlPanel";

    private static final float DISABLED_ALPHA = 0.38f;

    private static final String EXTRAS_MEDIA_SOURCE_PACKAGE_NAME = "package_name";

    private static final String EXTRAS_SMARTSPACE_INTENT =

            "com.google.android.apps.gsa.smartspace.extra.SMARTSPACE_INTENT";

    private static final String KEY_SMARTSPACE_OPEN_IN_FOREGROUND = "KEY_OPEN_IN_FOREGROUND";

    private static final int MEDIA_RECOMMENDATION_ITEMS_PER_ROW = 3;

    private static final int MEDIA_RECOMMENDATION_MAX_NUM = 6;
@@ -653,16 +657,47 @@ public class MediaControlPanel { 
                    /* rank */ 1,

                    /* cardinality */ 1);



            if (shouldSmartspaceRecItemOpenInForeground(action)) {

                // Request to unlock the device if the activity needs to be opened in foreground.

                mActivityStarter.postStartActivityDismissingKeyguard(

                        action.getIntent(),

                        0 /* delay */,

                    buildLaunchAnimatorController(mRecommendationViewHolder.getRecommendations()));

                        buildLaunchAnimatorController(

                                mRecommendationViewHolder.getRecommendations()));

            } else {

                // Otherwise, open the activity in background directly.

                view.getContext().startActivity(action.getIntent());

            }



            if (callback != null) {

                callback.onClick(v);

            }

        });

    }



    /** Returns if the Smartspace action will open the activity in foreground. */

    private boolean shouldSmartspaceRecItemOpenInForeground(SmartspaceAction action) {

        if (action == null || action.getIntent() == null

                || action.getIntent().getExtras() == null) {

            return false;

        }



        String intentString = action.getIntent().getExtras().getString(EXTRAS_SMARTSPACE_INTENT);

        if (intentString == null) {

            return false;

        }



        try {

            Intent wrapperIntent = Intent.parseUri(intentString, Intent.URI_INTENT_SCHEME);

            return wrapperIntent.getBooleanExtra(KEY_SMARTSPACE_OPEN_IN_FOREGROUND, false);

        } catch (URISyntaxException e) {

            Log.wtf(TAG, "Failed to create intent from URI: " + intentString);

            e.printStackTrace();

        }



        return false;

    }



    private int getSurfaceForSmartspaceLogging(int currentEndLocation) {

        if (currentEndLocation == MediaHierarchyManager.LOCATION_QQS

                || currentEndLocation == MediaHierarchyManager.LOCATION_QS) {