PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jason Monk
2014-11-07 16:58:37 +00:00
committed by Android (Google) Code Review
parent 5d6b47c1a2 d570e9839e
commit cc0a2c554a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout/screen_pinning_instructions.xml
View File

@@ -17,14 +17,11 @@
*/ */
--> -->
<LinearLayout <ScrollView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/instructions_area" android:id="@+id/instructions_area"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:orientation="vertical"
android:paddingStart="@dimen/screen_margin_sides"
android:paddingEnd="@dimen/screen_margin_sides">
<TextView <TextView
android:id="@+id/screen_pinning_description" android:id="@+id/screen_pinning_description"
@@ -34,6 +31,8 @@
android:paddingTop="@dimen/screen_pinning_textview_padding" android:paddingTop="@dimen/screen_pinning_textview_padding"
android:text="@string/screen_pinning_description" android:text="@string/screen_pinning_description"
android:textAppearance="@style/TextAppearance.Medium" android:textAppearance="@style/TextAppearance.Medium"
android:paddingStart="@dimen/screen_margin_sides"
android:paddingEnd="@dimen/screen_margin_sides"
/> />
</LinearLayout> </ScrollView>

2
res/values/strings.xml
View File

@@ -5921,7 +5921,7 @@
<!-- [CHAR LIMIT=28] Screen pinning title --> <!-- [CHAR LIMIT=28] Screen pinning title -->
<string name="screen_pinning_title">Screen pinning</string> <string name="screen_pinning_title">Screen pinning</string>
<!-- [CHAR LIMIT=300] Screen pinning description --> <!-- [CHAR LIMIT=300] Screen pinning description -->
<string name="screen_pinning_description">When turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure screen pinning is turned on.\n\n2. Open the screen you want to pin.\n\n3. Touch Overview.\n\n4. Touch the pin icon.</string> <string name="screen_pinning_description">When this setting is turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure screen pinning is turned on.\n\n2. Open the screen you want to pin.\n\n3. Touch Overview.\n\n4. Swipe up and then touch the pin icon.</string>
<!-- [CHAR LIMIT=60] Unlock setting for screen pinning --> <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
<string name="screen_pinning_unlock_pattern">Ask for unlock pattern before unpinning</string> <string name="screen_pinning_unlock_pattern">Ask for unlock pattern before unpinning</string>
<!-- [CHAR LIMIT=60] Unlock setting for screen pinning --> <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->