Merge "Fix 3315488: Wrap OwnerInfo layout in a ScrollView" into honeycomb
diff --git a/res/layout/ownerinfo.xml b/res/layout/ownerinfo.xml
index 469fc50..a6ff904 100644
--- a/res/layout/ownerinfo.xml
+++ b/res/layout/ownerinfo.xml
@@ -20,38 +20,52 @@
android:layout_width="match_parent" android:layout_height="wrap_content"
android:scrollbars="vertical" >
- <View
- android:paddingTop="53dip"
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="1dip"
- android:background="#ff404040"
- />
+ android:layout_height="match_parent"
+ android:fillViewport="true">
- <CheckBox android:id="@+id/show_owner_info_on_lockscreen_checkbox"
- android:layout_width="match_parent"
- android:layout_height="64dip"
- android:gravity="center_vertical"
- android:text="@string/show_owner_info_on_lockscreen_label"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="?android:attr/textColorSecondary"
- />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
- <View
- android:layout_width="match_parent"
- android:layout_height="1dip"
- android:background="#ff404040"
- />
+ <View
+ android:paddingTop="53dip"
+ android:layout_width="match_parent"
+ android:layout_height="1dip"
+ android:background="#ff404040"
+ />
- <EditText android:id="@+id/owner_info_edit_text"
- android:layout_width="480dip"
- android:layout_height="wrap_content"
- android:layout_marginLeft="62dip"
- android:layout_marginTop="40dip"
- android:gravity="top"
- android:hint="@string/owner_info_settings_edit_text_hint"
- android:lines="8"
- android:maxLines="8"
- />
+ <CheckBox android:id="@+id/show_owner_info_on_lockscreen_checkbox"
+ android:layout_width="match_parent"
+ android:layout_height="64dip"
+ android:gravity="center_vertical"
+ android:text="@string/show_owner_info_on_lockscreen_label"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?android:attr/textColorSecondary"
+ />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dip"
+ android:background="#ff404040"
+ />
+
+ <EditText android:id="@+id/owner_info_edit_text"
+ android:layout_width="480dip"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="62dip"
+ android:layout_marginTop="40dip"
+ android:gravity="top"
+ android:hint="@string/owner_info_settings_edit_text_hint"
+ android:lines="8"
+ android:maxLines="8"
+ />
+
+ </LinearLayout>
+
+ </ScrollView>
</LinearLayout>