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

Commit 39c0921b authored by Jaewan Kim's avatar Jaewan Kim Committed by Android (Google) Code Review
Browse files

Merge "PIP: Apply the latest UI spec for overlay text" into nyc-dev

parents 77dd59fc 236950e5
Loading
Loading
Loading
Loading
+23 −0
Original line number Diff line number Diff line
<!--
     Copyright (C) 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.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">

    <gradient
        android:startColor="#B2000000"
        android:endColor="#00000000"
        android:angle="90"/>
</shape>
+6 −5
Original line number Diff line number Diff line
@@ -24,12 +24,13 @@
    <TextView
        android:id="@+id/guide_overlay"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_height="32dp"
        android:layout_alignParentBottom="true"
        android:padding="3dp"
        android:textSize="13sp"
        android:textColor="#111111"
        android:background="#99EEEEEE"
        android:textSize="14sp"
        android:textColor="#EEEEEE"
        android:fontFamily="sans-serif"
        android:background="@drawable/tv_pip_overlay_background"
        android:gravity="center"
        android:text="@string/pip_hold_home" />
    <LinearLayout
        android:id="@+id/guide_buttons"
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@
    <!-- Button to close PIP overlay menu on PIP UI -->
    <string name="pip_cancel" translatable="false">Cancel</string>
    <!-- Overlay text on PIP -->
    <string name="pip_hold_home" translatable="false">Hold HOME to control PIP</string>
    <string name="pip_hold_home" translatable="false">Hold <b>HOME</b> to control PIP</string>
    <!-- Picture-in-Picture onboarding screen -->
    <eat-comment />
    <!-- Description for onboarding screen. -->