From 6099fbb7e2bf4b035f579e8c211bcb13c88432f2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 26 Jun 2012 00:36:38 +0400
Subject: disable viewscroll (unstable on ICS, refs #462) enable split action
 bar back

---
 res/layout-xlarge/article_fragment.xml | 103 ----------------------
 res/layout/article_fragment.xml        | 150 ++++++++++++++++-----------------
 2 files changed, 71 insertions(+), 182 deletions(-)
 delete mode 100644 res/layout-xlarge/article_fragment.xml

diff --git a/res/layout-xlarge/article_fragment.xml b/res/layout-xlarge/article_fragment.xml
deleted file mode 100644
index 94e0a42e..00000000
--- a/res/layout-xlarge/article_fragment.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/article_fragment"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="horizontal" >
-
-    <LinearLayout
-        xmlns:ads="http://schemas.android.com/apk/lib/com.google.ads"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/article_holder"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:padding="5sp" >
-
-        <LinearLayout
-            android:id="@+id/article_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:orientation="vertical"
-            android:paddingBottom="5sp" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="There are many variations of passages of Lorem Ipsum available"
-                android:textSize="16sp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" >
-
-                <TextView
-                    android:id="@+id/tags"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:text="{TAGS}"
-                    android:textSize="13sp" />
-
-                <TextView
-                    android:id="@+id/date"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.2"
-                    android:gravity="right"
-                    android:text="{DATE}"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textSize="13sp" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:background="?horizontalDivider"
-            android:paddingTop="2dip" />
-
-        <WebView
-            android:id="@+id/content"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:padding="5sp" />
-
-        <LinearLayout
-            android:id="@+id/attachments_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0" >
-
-            <Spinner
-                android:id="@+id/attachments"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:prompt="@string/attachments_prompt" />
-
-            <Button
-                android:id="@+id/attachment_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_view" />
-
-            <Button
-                android:id="@+id/attachment_copy"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_copy" />
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index ff7380c8..94e0a42e 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -3,109 +3,101 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="horizontal" >
-

-    <ScrollView
-        android:id="@+id/scrollView1"
+
+    <LinearLayout
+        xmlns:ads="http://schemas.android.com/apk/lib/com.google.ads"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/article_holder"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1" >
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:padding="5sp" >
 
         <LinearLayout
-            xmlns:ads="http://schemas.android.com/apk/lib/com.google.ads"
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/article_holder"
+            android:id="@+id/article_header"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
             android:orientation="vertical"
-            android:padding="5sp" >
+            android:paddingBottom="5sp" >
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="There are many variations of passages of Lorem Ipsum available"
+                android:textSize="16sp" />
 
             <LinearLayout
-                android:id="@+id/article_header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:orientation="vertical"
-                android:paddingBottom="5sp" >
+                android:layout_weight="1" >
 
                 <TextView
-                    android:id="@+id/title"
-                    android:layout_width="match_parent"
+                    android:id="@+id/tags"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="There are many variations of passages of Lorem Ipsum available"
-                    android:textSize="16sp" />
+                    android:layout_weight="0.7"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:text="{TAGS}"
+                    android:textSize="13sp" />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/date"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1" >
+                    android:layout_weight="0.2"
+                    android:gravity="right"
+                    android:text="{DATE}"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textSize="13sp" />
+            </LinearLayout>
+        </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/tags"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0.7"
-                        android:ellipsize="end"
-                        android:singleLine="true"
-                        android:text="{TAGS}"
-                        android:textSize="13sp" />
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:background="?horizontalDivider"
+            android:paddingTop="2dip" />
 
-                    <TextView
-                        android:id="@+id/date"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0.2"
-                        android:gravity="right"
-                        android:text="{DATE}"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textSize="13sp" />
-                </LinearLayout>
-            </LinearLayout>
+        <WebView
+            android:id="@+id/content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:padding="5sp" />
 
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:background="?horizontalDivider"
-                android:paddingTop="2dip" />
+        <LinearLayout
+            android:id="@+id/attachments_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0" >
 
-            <WebView
-                android:id="@+id/content"
+            <Spinner
+                android:id="@+id/attachments"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:padding="5sp" />
+                android:prompt="@string/attachments_prompt" />
 
-            <LinearLayout
-                android:id="@+id/attachments_holder"
-                android:layout_width="match_parent"
+            <Button
+                android:id="@+id/attachment_view"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="0" >
-
-                <Spinner
-                    android:id="@+id/attachments"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:prompt="@string/attachments_prompt" />
-
-                <Button
-                    android:id="@+id/attachment_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:text="@string/attachment_view" />
+                android:layout_weight="0"
+                android:text="@string/attachment_view" />
 
-                <Button
-                    android:id="@+id/attachment_copy"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:text="@string/attachment_copy" />
-            </LinearLayout>
+            <Button
+                android:id="@+id/attachment_copy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:text="@string/attachment_copy" />
         </LinearLayout>
-
-    </ScrollView>
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf