From 4d8709652e4041fa1d69cb288b14a70aea823b58 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 9 Feb 2015 23:05:44 +0300
Subject: set minimum sdk level to 15 remove legacy article layout

---
 .../main/res/layout/article_fragment_compat.xml    | 79 ----------------------
 org.fox.ttrss/src/main/res/xml/preferences.xml     |  5 --
 2 files changed, 84 deletions(-)
 delete mode 100644 org.fox.ttrss/src/main/res/layout/article_fragment_compat.xml

(limited to 'org.fox.ttrss/src/main/res')

diff --git a/org.fox.ttrss/src/main/res/layout/article_fragment_compat.xml b/org.fox.ttrss/src/main/res/layout/article_fragment_compat.xml
deleted file mode 100644
index 1a9c74ed..00000000
--- a/org.fox.ttrss/src/main/res/layout/article_fragment_compat.xml
+++ /dev/null
@@ -1,79 +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:background="?articleBackground"
-    android:orientation="vertical"
-    android:padding="5sp" >
-
-    <org.fox.ttrss.util.TitleWebView
-        android:id="@+id/article_content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
-        
-            <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="2dp" >
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingBottom="4dp"
-            android:text="My simple headline"
-            android:textColor="?linkColor"
-            android:textSize="18sp" />
-
-        <TextView
-            android:id="@+id/comments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="24 comments"
-            android:fontFamily="sans-serif-light"
-            android:textColor="?linkColor"
-            android:textSize="12sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="4dp"
-            android:layout_weight="1" >
-
-            <TextView
-                android:id="@+id/tags"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.5"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:text="Example Feed"
-                android:fontFamily="sans-serif-light"
-                android:textColor="?headlineSecondaryTextColor"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.5"
-                android:gravity="right"
-                android:text="Jan 01, 12:00"
-                android:fontFamily="sans-serif-light"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?headlineSecondaryTextColor"
-                android:textSize="12sp" />
-        </LinearLayout>
-    </LinearLayout>
-        
-        
-        </org.fox.ttrss.util.TitleWebView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 290a08e2..d37cef41 100644
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -173,11 +173,6 @@
             android:title="@string/offline_image_cache_enabled" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/debugging" >
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="article_compat_view"
-            android:title="@string/prefs_compatible_article_layout"
-            android:summary="@string/prefs_compatible_layout_summary" />
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="webview_hardware_accel"
-- 
cgit v1.2.3-54-g00ecf