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

Merge "Fix 3315488: Wrap OwnerInfo layout in a ScrollView" into honeycomb

Browse Source
This commit is contained in:
Jim Miller
2011-01-23 18:25:21 -08:00
committed by Android (Google) Code Review
parent a31be80ef0 3752ef7847
commit 22c060ebd1
1 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
res/layout/ownerinfo.xml
View File

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