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

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

Merge "Fix TvPipMenuActionButton not found"

parents 28584e88 d9855618

libs/WindowManager/Shell/res/layout/tv_pip_menu.xml

+6 −6
Original line number Diff line number Diff line
@@ -68,30 +68,30 @@ 
                    android:layout_width="@dimen/pip_menu_button_wrapper_margin"

                    android:layout_height="@dimen/pip_menu_button_wrapper_margin"/>



                <com.android.wm.shell.pip.tv.TvPipMenuActionButton

                <com.android.wm.shell.common.TvWindowMenuActionButton

                    android:id="@+id/tv_pip_menu_fullscreen_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:src="@drawable/pip_ic_fullscreen_white"

                    android:text="@string/pip_fullscreen" />



                <com.android.wm.shell.pip.tv.TvPipMenuActionButton

                <com.android.wm.shell.common.TvWindowMenuActionButton

                    android:id="@+id/tv_pip_menu_close_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:src="@drawable/pip_ic_close_white"

                    android:text="@string/pip_close" />



                <!-- More TvPipMenuActionButtons may be added here at runtime. -->

                <!-- More TvWindowMenuActionButtons may be added here at runtime. -->



                <com.android.wm.shell.pip.tv.TvPipMenuActionButton

                <com.android.wm.shell.common.TvWindowMenuActionButton

                    android:id="@+id/tv_pip_menu_move_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:src="@drawable/pip_ic_move_white"

                    android:text="@string/pip_move" />



                <com.android.wm.shell.pip.tv.TvPipMenuActionButton

                <com.android.wm.shell.common.TvWindowMenuActionButton

                    android:id="@+id/tv_pip_menu_expand_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"
@@ -154,7 +154,7 @@ 
        android:background="@drawable/tv_pip_menu_border"/>



    <!-- Move menu -->

    <com.android.wm.shell.pip.tv.TvPipMenuActionButton

    <com.android.wm.shell.common.TvWindowMenuActionButton

        android:id="@+id/tv_pip_menu_done_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ public class TvWindowMenuActionButton extends RelativeLayout implements View.OnC 


    @Override

    public void setOnClickListener(OnClickListener listener) {

        // We do not want to set an OnClickListener to the TvPipMenuActionButton itself, but only to

        // the ImageView. So let's "cash" the listener we've been passed here and set a "proxy"

        // We do not want to set an OnClickListener to the TvWindowMenuActionButton itself, but only

        // to the ImageView. So let's "cash" the listener we've been passed here and set a "proxy"

        // listener to the ImageView.

        mOnClickListener = listener;

        mButtonView.setOnClickListener(listener != null ? this : null);