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

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

Merge "Fix TV PiP custom action style" into udc-dev

parents 06dfb810 bee10036

libs/WindowManager/Shell/res/drawable/tv_window_button_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

    <corners android:radius="@dimen/tv_window_menu_button_radius" />

    <solid android:color="@color/tv_window_menu_icon_bg" />

    <solid android:color="@android:color/white" />

</shape>
 
 No newline at end of file

libs/WindowManager/Shell/src/com/android/wm/shell/common/TvWindowMenuActionButton.java

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ public class TvWindowMenuActionButton extends RelativeLayout { 
            setTextAndDescription(textResId);

        }

        typedArray.recycle();



        setIsCustomCloseAction(false);

    }



    /**

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

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public class TvPipCustomAction extends TvPipAction { 
        }

        button.setImageIconAsync(mRemoteAction.getIcon(), mainHandler);

        button.setEnabled(isCloseAction() || mRemoteAction.isEnabled());

        button.setIsCustomCloseAction(isCloseAction());

    }



    PendingIntent getPendingIntent() {

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

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public class TvPipSystemAction extends TvPipAction { 
        button.setTextAndDescription(mTitleResource);

        button.setImageResource(mIconResource);

        button.setEnabled(true);

        button.setIsCustomCloseAction(false);

    }



    PendingIntent getPendingIntent() {