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

Merge "PIP: Update char limit and description for translation" into nyc-dev

Browse Source
This commit is contained in:
Jaewan Kim
2016-03-14 21:52:30 +00:00
committed by Android (Google) Code Review
parent 513f77c8ef eafce4537e
commit 2f9ac1ad8b
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values-television/config.xml
View File

@@ -25,7 +25,7 @@
<bool name="config_defaultWindowFeatureOptionsPanel">false</bool>
<!-- Default bounds [left top right bottom] on screen for picture-in-picture windows. -->
<string translatable="false" name="config_defaultPictureInPictureBounds">"1420 100 1820 325"</string>
<string translatable="false" name="config_defaultPictureInPictureBounds">"1328 54 1808 324"</string>
<!-- Bounds [left top right bottom] on screen for picture-in-picture (PIP) windows, when the PIP
is located in center. -->

3
packages/SystemUI/res/layout/tv_pip_onboarding.xml
View File

@@ -37,10 +37,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:fontFamily="sans-serif"
android:textSize="16sp"
android:textColor="#EEEEEE"
android:lineSpacingMultiplier="1.28"
android:gravity="top|center_horizontal"
android:text="@string/pip_onboarding_description" />
<Button
android:id="@+id/close"

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

@@ -24,13 +24,19 @@
<TextView
android:id="@+id/guide_overlay"
android:layout_width="match_parent"
android:layout_height="32dp"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:textSize="14sp"
android:textColor="#EEEEEE"
android:fontFamily="sans-serif"
android:background="@drawable/tv_pip_overlay_background"
android:lineSpacingMultiplier="1.465"
android:gravity="center"
android:maxLines="2"
android:text="@string/pip_hold_home" />
<LinearLayout
android:id="@+id/guide_buttons"

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

@@ -27,13 +27,12 @@
<string name="pip_play">Play</string>
<!-- Button to pause the current media on picture-in-picture (PIP) [CHAR LIMIT=16] -->
<string name="pip_pause">Pause</string>
<!-- Overlay text on picture-in-picture (PIP) to indicate that longpress HOME key to control PIP [CHAR LIMIT=25] -->
<!-- Overlay text on picture-in-picture (PIP) to indicate that longpress HOME key to control PIP [CHAR LIMIT=52] -->
<string name="pip_hold_home">Hold <b>HOME</b> to control PIP</string>
<!-- Picture-in-Picture (PIP) onboarding screen -->
<eat-comment />
<!-- Description for picture-in-picture (PIP) onboarding screen to indicate that longpress HOME key to control PIP.
Line break is needed as if we have CHAR LIMIT=25. [CHAR LIMIT=NONE] -->
<string name="pip_onboarding_description">Press and hold the HOME\nbutton to control PIP</string>
<!-- Description for picture-in-picture (PIP) onboarding screen to indicate that longpress HOME key to control PIP. [CHAR LIMIT=NONE] -->
<string name="pip_onboarding_description">Press and hold the HOME button to control PIP</string>
<!-- Button to close picture-in-picture (PIP) onboarding screen. -->
<string name="pip_onboarding_button">Got it</string>
<!-- Font for Recents -->