Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaewan Kim
2016-03-07 01:22:55 +00:00
committed by Android (Google) Code Review
parent 77dd59fc2a 236950e5b3
commit 39c0921b45
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/res/drawable/tv_pip_overlay_background.xml Normal file
View File

@@ -0,0 +1,23 @@
<!--
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>

11
packages/SystemUI/res/layout/tv_pip_overlay.xml
View File

@@ -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"

2
packages/SystemUI/res/values/strings_tv.xml
View File

@@ -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. -->