am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo

Merge commit 'ab924c909a516eb71fef7c238a20c7755f8170ed' into froyo-plus-aosp

* commit 'ab924c909a516eb71fef7c238a20c7755f8170ed':
  Make EditTextPreference scrollable.
This commit is contained in:
Romain Guy
2010-03-29 11:28:07 -07:00
committed by Android Git Automerger

View File

@@ -15,17 +15,24 @@
--> -->
<!-- Layout used as the dialog's content View for EditTextPreference. --> <!-- Layout used as the dialog's content View for EditTextPreference. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+android:id/edittext_container" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="match_parent"
android:layout_height="wrap_content" android:overscrollMode="ifContentScrolls">
android:padding="5dip"
android:orientation="vertical"> <LinearLayout
android:id="@+android:id/edittext_container"
<TextView android:id="@+android:id/message"
style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary" /> android:padding="5dip"
android:orientation="vertical">
</LinearLayout>
<TextView android:id="@+android:id/message"
style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary" />
</LinearLayout>
</ScrollView>