diff options
| author | Wei Liu <luciferleo@google.com> | 2014-10-07 23:02:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 23:02:17 +0000 |
| commit | 6bf67ef1ce029ad0932df647598c6fbfae375885 (patch) | |
| tree | 27e8fab5854e3779d0521be77edb3392b5567a0b /packages | |
| parent | 40014e1db563946999dac2ded00345e6e92207eb (diff) | |
| parent | c7d477bb7d9d2391ad3d26bbe4718e7956597d20 (diff) | |
| download | frameworks_base-6bf67ef1ce029ad0932df647598c6fbfae375885.zip frameworks_base-6bf67ef1ce029ad0932df647598c6fbfae375885.tar.gz frameworks_base-6bf67ef1ce029ad0932df647598c6fbfae375885.tar.bz2 | |
am c7d477bb: Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev
* commit 'c7d477bb7d9d2391ad3d26bbe4718e7956597d20':
Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/Shell/res/layout/confirm_repeat.xml | 17 |
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" |