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

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

Browse Source 
* commit '22c060ebd14bd92c67bd97f53d67bb06f0a215de':
  Fix 3315488: Wrap OwnerInfo layout in a ScrollView
This commit is contained in:
Jim Miller
2011-01-23 23:36:31 -08:00
committed by Android Git Automerger
parent cb671560ef 22c060ebd1
commit a634d843b5
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:layout_width="match_parent" android:layout_height="wrap_content"
android:scrollbars="vertical" > android:scrollbars="vertical" >
<View <ScrollView
android:paddingTop="53dip"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dip" android:layout_height="match_parent"
android:background="#ff404040" android:fillViewport="true">
/>
<CheckBox android:id="@+id/show_owner_info_on_lockscreen_checkbox" <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dip" android:layout_height="wrap_content"
android:gravity="center_vertical" android:orientation="vertical">
android:text="@string/show_owner_info_on_lockscreen_label"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"
/>
<View <View
android:layout_width="match_parent" android:paddingTop="53dip"
android:layout_height="1dip" android:layout_width="match_parent"
android:background="#ff404040" android:layout_height="1dip"
/> android:background="#ff404040"
/>
<EditText android:id="@+id/owner_info_edit_text" <CheckBox android:id="@+id/show_owner_info_on_lockscreen_checkbox"
android:layout_width="480dip" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="64dip"
android:layout_marginLeft="62dip" android:gravity="center_vertical"
android:layout_marginTop="40dip" android:text="@string/show_owner_info_on_lockscreen_label"
android:gravity="top" android:textAppearance="?android:attr/textAppearanceMedium"
android:hint="@string/owner_info_settings_edit_text_hint" android:textColor="?android:attr/textColorSecondary"
android:lines="8" />
android:maxLines="8"
/> <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> </LinearLayout>