commit 94f06154012b57650aa79af9210fc73311333601
author Wei Liu <luciferleo@google.com> Tue Oct 07 23:06:45 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 07 23:06:45 2014 +0000
tree 27e8fab5854e3779d0521be77edb3392b5567a0b
parent e081852014538b01f06c61ea8c2f1499606a1d8a
parent 6bf67ef1ce029ad0932df647598c6fbfae375885

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.

packages/Shell/res/layout/confirm_repeat.xml

diff --git a/packages/Shell/res/layout/confirm_repeat.xml b/packages/Shell/res/layout/confirm_repeat.xml
index dc250d6..d12f467 100644
--- a/packages/Shell/res/layout/confirm_repeat.xml
+++ b/packages/Shell/res/layout/confirm_repeat.xml
@@ -22,13 +22,18 @@
     android:paddingEnd="16dip"
     android:paddingTop="8dip"
     android:paddingBottom="16dip"
-    android:orientation="vertical">
-    <TextView
+    android:orientation="vertical"
+    android:keepScreenOn="true">
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/bugreport_confirm"
-        android:paddingBottom="16dip"
-        style="?android:attr/textAppearanceMedium" />
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/bugreport_confirm"
+            android:paddingBottom="16dip"
+            style="?android:attr/textAppearanceMedium" />
+    </ScrollView>
     <CheckBox
         android:id="@android:id/checkbox"
         android:layout_width="match_parent"