merge separate-activities

1 files changed, 11 insertions, 13 deletions

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index 94e0a42e..0b847017 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -1,18 +1,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

     android:id="@+id/article_fragment"

     android:layout_width="fill_parent"

+    android:padding="5sp"

     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" >

+    android:orientation="vertical" >
 

         <LinearLayout

             android:id="@+id/article_header"

@@ -24,6 +15,7 @@
 

             <TextView

                 android:id="@+id/title"

+                android:textColor="?linkColor"

                 android:layout_width="match_parent"

                 android:layout_height="wrap_content"

                 android:layout_weight="1"

@@ -92,12 +84,18 @@
                 android:text="@string/attachment_view" />

 

             <Button

+                android:id="@+id/attachment_share"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:layout_weight="0"

+                android:text="@string/attachment_share" />

+            

+            <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