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

Commit 1573f2da authored by Jacqueline Bronger's avatar Jacqueline Bronger Committed by Android (Google) Code Review
Browse files

Merge "Tv PiP: add constant for custom actions extra." into udc-dev

parents 4d400935 583a1b75

libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipAction.java

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,12 @@ import java.util.Objects; 


abstract class TvPipAction {



    /**

     * Extras key for adding a boolean to the {@link Notification.Action} to differentiate custom

     * from system actions, most importantly to identify custom close actions.

     **/

    public static final String EXTRA_IS_PIP_CUSTOM_ACTION = "EXTRA_IS_PIP_CUSTOM_ACTION";



    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = {"ACTION_"}, value = {

            ACTION_FULLSCREEN,

libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipCustomAction.java

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public class TvPipCustomAction extends TvPipAction { 
        Bundle extras = new Bundle();

        extras.putCharSequence(Notification.EXTRA_PICTURE_CONTENT_DESCRIPTION,

                mRemoteAction.getContentDescription());

        extras.putBoolean(Notification.EXTRA_CONTAINS_CUSTOM_VIEW, true);

        extras.putBoolean(TvPipAction.EXTRA_IS_PIP_CUSTOM_ACTION, true);

        builder.addExtras(extras);



        builder.setSemanticAction(isCloseAction()