Merge "Make "Take bugreport" dialog scrollable." into nyc-dev

This commit is contained in:
Felipe Leme
2016-04-12 18:41:16 +00:00
committed by Android (Google) Code Review

View File

@@ -15,66 +15,68 @@
limitations under the License. limitations under the License.
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android">
android:layout_width="match_parent" <RelativeLayout
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingEnd="24dp"
android:paddingTop="15dp"
>
<CheckedTextView
android:id="@+id/bugreport_option_interactive_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:checked="true" android:orientation="horizontal"
android:drawableStart="?android:attr/listChoiceIndicatorSingle" android:paddingStart="20dp"
android:ellipsize="marquee" android:paddingEnd="24dp"
android:gravity="center_vertical" android:paddingTop="15dp"
android:paddingEnd="?android:attr/dialogPreferredPadding" >
android:text="@*android:string/bugreport_option_interactive_title"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorAlertDialogListItem" />
<TextView <CheckedTextView
android:id="@+id/bugreport_option_interactive_summary" android:id="@+id/bugreport_option_interactive_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/bugreport_option_interactive_title" android:checked="true"
android:maxLines="10" android:drawableStart="?android:attr/listChoiceIndicatorSingle"
android:paddingBottom="10dp" android:ellipsize="marquee"
android:paddingStart="32dp" android:gravity="center_vertical"
android:paddingEnd="?android:attr/dialogPreferredPadding" android:paddingEnd="?android:attr/dialogPreferredPadding"
android:text="@*android:string/bugreport_option_interactive_summary" android:text="@*android:string/bugreport_option_interactive_title"
android:textAppearance="?android:attr/textAppearanceListItemSecondary" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorAlertDialogListItem" />
<CheckedTextView <TextView
android:id="@+id/bugreport_option_full_title" android:id="@+id/bugreport_option_interactive_summary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/bugreport_option_interactive_summary" android:layout_below="@+id/bugreport_option_interactive_title"
android:checked="false" android:maxLines="10"
android:drawableStart="?android:attr/listChoiceIndicatorSingle" android:paddingBottom="10dp"
android:ellipsize="marquee" android:paddingStart="32dp"
android:gravity="center_vertical" android:paddingEnd="?android:attr/dialogPreferredPadding"
android:paddingEnd="?android:attr/dialogPreferredPadding" android:text="@*android:string/bugreport_option_interactive_summary"
android:text="@*android:string/bugreport_option_full_title" android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="?android:attr/textColorSecondary" />
android:textColor="?android:attr/textColorAlertDialogListItem" />
<TextView <CheckedTextView
android:id="@+id/bugreport_option_full_summary" android:id="@+id/bugreport_option_full_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/bugreport_option_full_title" android:layout_below="@+id/bugreport_option_interactive_summary"
android:maxLines="10" android:checked="false"
android:paddingBottom="10dp" android:drawableStart="?android:attr/listChoiceIndicatorSingle"
android:paddingStart="32dp" android:ellipsize="marquee"
android:paddingEnd="?android:attr/dialogPreferredPadding" android:gravity="center_vertical"
android:text="@*android:string/bugreport_option_full_summary" android:paddingEnd="?android:attr/dialogPreferredPadding"
android:textAppearance="?android:attr/textAppearanceListItemSecondary" android:text="@*android:string/bugreport_option_full_title"
android:textColor="?android:attr/textColorSecondary" /> android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorAlertDialogListItem" />
</RelativeLayout> <TextView
android:id="@+id/bugreport_option_full_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/bugreport_option_full_title"
android:maxLines="10"
android:paddingBottom="10dp"
android:paddingStart="32dp"
android:paddingEnd="?android:attr/dialogPreferredPadding"
android:text="@*android:string/bugreport_option_full_summary"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary" />
</RelativeLayout>
</ScrollView>