diff options
| author | Jason Monk <jmonk@google.com> | 2014-11-07 11:23:02 -0500 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2014-11-07 11:46:33 -0500 |
| commit | d570e9839ec27d3315f8a8f6b81308531fd7a047 (patch) | |
| tree | 3c04e5b8b570c172e41329b756b209d5930838ee /res | |
| parent | b46a9194fe88a26e80d415919d191703c340925e (diff) | |
| download | packages_apps_Settings-d570e9839ec27d3315f8a8f6b81308531fd7a047.zip packages_apps_Settings-d570e9839ec27d3315f8a8f6b81308531fd7a047.tar.gz packages_apps_Settings-d570e9839ec27d3315f8a8f6b81308531fd7a047.tar.bz2 | |
Screen pinning: fix strings and add scrollview
Update strings as requested from ewong, and add scrollview around
description for large-text/small-device case.
Bug: 18287056
Bug: 17177672
Change-Id: Ie34007d263a1fbc77fc8f435dbcd23a36f1766c3
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/screen_pinning_instructions.xml | 11 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/res/layout/screen_pinning_instructions.xml b/res/layout/screen_pinning_instructions.xml index 22b2b37..80fec3c 100644 --- a/res/layout/screen_pinning_instructions.xml +++ b/res/layout/screen_pinning_instructions.xml @@ -17,14 +17,11 @@ */ --> -<LinearLayout +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/instructions_area" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:paddingStart="@dimen/screen_margin_sides" - android:paddingEnd="@dimen/screen_margin_sides"> + android:layout_height="match_parent"> <TextView android:id="@+id/screen_pinning_description" @@ -34,6 +31,8 @@ android:paddingTop="@dimen/screen_pinning_textview_padding" android:text="@string/screen_pinning_description" android:textAppearance="@style/TextAppearance.Medium" + android:paddingStart="@dimen/screen_margin_sides" + android:paddingEnd="@dimen/screen_margin_sides" /> -</LinearLayout> +</ScrollView> diff --git a/res/values/strings.xml b/res/values/strings.xml index fbf37ab..f2a99c6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5922,7 +5922,7 @@ <!-- [CHAR LIMIT=28] Screen pinning title --> <string name="screen_pinning_title">Screen pinning</string> <!-- [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 --> <string name="screen_pinning_unlock_pattern">Ask for unlock pattern before unpinning</string> <!-- [CHAR LIMIT=60] Unlock setting for screen pinning --> |