am 6bf67ef1: am c7d477bb: Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev

* commit '6bf67ef1ce029ad0932df647598c6fbfae375885':
  Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable.
This commit is contained in:
Wei Liu
2014-10-07 23:06:45 +00:00
committed by Android Git Automerger

View File

@@ -22,13 +22,18 @@
android:paddingEnd="16dip" android:paddingEnd="16dip"
android:paddingTop="8dip" android:paddingTop="8dip"
android:paddingBottom="16dip" android:paddingBottom="16dip"
android:orientation="vertical"> android:orientation="vertical"
<TextView android:keepScreenOn="true">
<ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:text="@string/bugreport_confirm" <TextView
android:paddingBottom="16dip" android:layout_width="match_parent"
style="?android:attr/textAppearanceMedium" /> android:layout_height="wrap_content"
android:text="@string/bugreport_confirm"
android:paddingBottom="16dip"
style="?android:attr/textAppearanceMedium" />
</ScrollView>
<CheckBox <CheckBox
android:id="@android:id/checkbox" android:id="@android:id/checkbox"
android:layout_width="match_parent" android:layout_width="match_parent"