commit 2ab1167f94efa7a15b608fd0e5a5c335e99870ef
author Pankaj Garg <pgarg@codeaurora.org> Fri Dec 12 10:51:20 2014 -0800
committer WebTech Code Review <code-review@localhost> Fri Dec 12 18:13:24 2014 -0800
tree 20d2520005a499c4e05276ff0f39f503a1bda030
parent 5ae52a04ebf5c95aa8095eeea4c333320e604129

Fixed browser crash on tablet for bookmark navigation

The history screen layout was missing Clear History button
element. This change was needed as part of new UI layouts.

Change-Id: Idab80c2df90f931894e251fe9343c2f2af56ea82

res/layout-sw600dp/history.xml

diff --git a/res/layout-sw600dp/history.xml b/res/layout-sw600dp/history.xml
index 2d949e1..594b85f 100644
--- a/res/layout-sw600dp/history.xml
+++ b/res/layout-sw600dp/history.xml
@@ -14,24 +14,43 @@
      limitations under the License.
 -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
->
+    android:orientation="vertical">
 
-    <ViewStub
-        android:id="@+id/pref_stub"
-        android:layout_height="match_parent"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:inflatedId="@+id/history" />
+        android:layout_height="match_parent"
+        android:layout_weight="90">
 
-    <TextView android:id="@android:id/empty"
-        android:layout_width="wrap_content"
+        <ViewStub
+            android:id="@+id/pref_stub"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:inflatedId="@+id/history" />
+
+        <TextView
+            android:id="@android:id/empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/empty_history"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:visibility="gone" />
+
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="@string/empty_history"
-        android:visibility="gone"
-    />
+        android:layout_alignParentBottom="true"
+        android:layout_weight="10">
 
-</FrameLayout>
+        <Button
+            android:id="@+id/clear_history_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/clear_history" />
+    </LinearLayout>
+</LinearLayout>