From 666eb3fa686fd678354cb9bf2cd55ede25561ea0 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Thu, 15 Mar 2012 20:12:46 +0000
Subject: [PATCH] backout 51839400b331 (bug 711753) for Android build bustage.

---
 .../base/resources/layout/crash_reporter.xml  | 116 +++++++++---------
 1 file changed, 55 insertions(+), 61 deletions(-)

diff --git a/mobile/android/base/resources/layout/crash_reporter.xml b/mobile/android/base/resources/layout/crash_reporter.xml
index 778eb61a0a8b..08795130a0a7 100644
--- a/mobile/android/base/resources/layout/crash_reporter.xml
+++ b/mobile/android/base/resources/layout/crash_reporter.xml
@@ -1,66 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            style="@style/Screen">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              style="@style/Screen"
+              android:padding="10dip" >
+
+    <TextView android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:padding="10dip"
+              android:textAppearance="?android:attr/textAppearanceMediumInverse"
+              android:textColor="?android:attr/textColorPrimaryInverse"
+              android:textStyle="bold"
+              android:text="@string/crash_message"/>
+
+    <TextView android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:padding="10dip"
+              android:textAppearance="?android:attr/textAppearanceMediumInverse"
+              android:textColor="?android:attr/textColorPrimaryInverse"
+              android:text="@string/crash_help_message"/>
+
+    <CheckBox android:id="@+id/send_report"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:checked="true"
+              android:textAppearance="?android:attr/textAppearanceMediumInverse"
+              android:textColor="?android:attr/textColorPrimaryInverse"
+              android:text="@string/crash_send_report_message"/>
+
+    <CheckBox android:id="@+id/include_url"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:textAppearance="?android:attr/textAppearanceMediumInverse"
+              android:textColor="?android:attr/textColorPrimaryInverse"
+              android:text="@string/crash_include_url"/>
 
     <LinearLayout android:layout_width="fill_parent"
-                 android:layout_width="fill_parent"
-                 android:orientation="vertical"
-                 android:padding="10dip">
-   
-       <TextView android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:padding="10dip"
-                 android:textAppearance="?android:attr/textAppearanceMediumInverse"
-                 android:textColor="?android:attr/textColorPrimaryInverse"
-                 android:textStyle="bold"
-                 android:text="@string/crash_message"/>
-   
-       <TextView android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:padding="10dip"
-                 android:textAppearance="?android:attr/textAppearanceMediumInverse"
-                 android:textColor="?android:attr/textColorPrimaryInverse"
-                 android:text="@string/crash_help_message"/>
-   
-       <CheckBox android:id="@+id/send_report"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:checked="true"
-                 android:textAppearance="?android:attr/textAppearanceMediumInverse"
-                 android:textColor="?android:attr/textColorPrimaryInverse"
-                 android:text="@string/crash_send_report_message"/>
-   
-       <CheckBox android:id="@+id/include_url"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:textAppearance="?android:attr/textAppearanceMediumInverse"
-                 android:textColor="?android:attr/textColorPrimaryInverse"
-                 android:text="@string/crash_include_url"/>
-   
-       <LinearLayout android:layout_width="fill_parent"
-                     android:layout_height="wrap_content"
-                     android:orientation="horizontal"
-                     android:padding="10dip"
-                     android:gravity="center_horizontal">
-   
-           <Button android:id="@+id/close"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_marginRight="10px"
-                   android:minWidth="120sp"
-                   android:onClick="onCloseClick"
-                   android:text="@string/crash_close_label"/>
-   
-           <Button android:id="@+id/restart"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_marginLeft="10px"
-                   android:minWidth="120sp"
-                   android:onClick="onRestartClick"
-                   android:text="@string/crash_restart_label"/>
-       
-       </LinearLayout>
-   
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  android:padding="10dip"
+                  android:gravity="center_horizontal">
+
+        <Button android:id="@+id/close"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10px"
+                android:minWidth="120sp"
+                android:onClick="onCloseClick"
+                android:text="@string/crash_close_label"/>
+
+        <Button android:id="@+id/restart"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10px"
+                android:minWidth="120sp"
+                android:onClick="onRestartClick"
+                android:text="@string/crash_restart_label"/>
+    
     </LinearLayout>
 
-</ScrollView>
+</LinearLayout>