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