summaryrefslogtreecommitdiffstats
path: root/packages/Shell
diff options
context:
space:
mode:
authorWei Liu <luciferleo@google.com>2014-10-06 13:29:55 -0700
committerWei Liu <luciferleo@google.com>2014-10-07 15:39:09 -0700
commit751160397d8d8fdaafed3598e5de643e71a901a3 (patch)
tree4ff2230ac7ae5f9d1c094e92b290515721b99fbd /packages/Shell
parent1a6c41fbad9c1c6725d189fdcf7dae2fe3f00b4d (diff)
downloadframeworks_base-751160397d8d8fdaafed3598e5de643e71a901a3.zip
frameworks_base-751160397d8d8fdaafed3598e5de643e71a901a3.tar.gz
frameworks_base-751160397d8d8fdaafed3598e5de643e71a901a3.tar.bz2
Keep the BugreportWarningActivity screen on.
Make the bugreport warning text scrollable. Bug: 16930717 Change-Id: I270ee3f3acdcdab2febc2a2768382bbfb20c438b
Diffstat (limited to 'packages/Shell')
-rw-r--r--packages/Shell/res/layout/confirm_repeat.xml17
1 files changed, 11 insertions, 6 deletions
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"