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

Commit 3217448d authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov Committed by Android (Google) Code Review
Browse files

Merge "Fix crash when inflating tv_pip_controls"

parents 9b8c7fca e87b9f75
Loading
Loading
Loading
Loading
+0 −53
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
**
** Copyright 2016, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
**     http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->

<!-- Layout for {@link com.android.systemui.pip.tv.PipControlButtonView}. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">

    <ImageView android:id="@+id/button"
        android:layout_width="34dp"
        android:layout_height="34dp"
        android:layout_alignParentTop="true"
        android:layout_centerHorizontal="true"
        android:focusable="true"
        android:src="@drawable/tv_pip_button_focused"
        android:importantForAccessibility="yes" />

    <ImageView android:id="@+id/icon"
        android:layout_width="34dp"
        android:layout_height="34dp"
        android:layout_alignParentTop="true"
        android:layout_centerHorizontal="true"
        android:padding="5dp"
        android:importantForAccessibility="no" />

    <TextView android:id="@+id/desc"
        android:layout_width="100dp"
        android:layout_height="wrap_content"
        android:layout_below="@id/icon"
        android:layout_centerHorizontal="true"
        android:layout_marginTop="3dp"
        android:gravity="center"
        android:text="@string/pip_fullscreen"
        android:alpha="0"
        android:fontFamily="sans-serif"
        android:textSize="12sp"
        android:textColor="#EEEEEE"
        android:importantForAccessibility="no" />
</merge>
+0 −46
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
**
** Copyright 2016, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
**     http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->

<!-- Layout for {@link com.android.systemui.pip.tv.PipControlsView}. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">

    <com.android.systemui.pip.tv.PipControlButtonView
        android:id="@+id/full_button"
        android:layout_width="@dimen/picture_in_picture_button_width"
        android:layout_height="wrap_content"
        android:src="@drawable/ic_fullscreen_white_24dp"
        android:text="@string/pip_fullscreen" />

    <com.android.systemui.pip.tv.PipControlButtonView
        android:id="@+id/close_button"
        android:layout_width="@dimen/picture_in_picture_button_width"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/picture_in_picture_button_start_margin"
        android:src="@drawable/ic_close_white"
        android:text="@string/pip_close" />

    <com.android.systemui.pip.tv.PipControlButtonView
        android:id="@+id/play_pause_button"
        android:layout_width="@dimen/picture_in_picture_button_width"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/picture_in_picture_button_start_margin"
        android:src="@drawable/ic_pause_white"
        android:text="@string/pip_pause"
        android:visibility="gone" />
</merge>