aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorHalzyn2015-06-02 15:46:05 +0200
committerHalzyn2015-06-02 15:46:05 +0200
commitc39d5720ef2fabfb57575a9d6c55406f1e451dab (patch)
treeb06e4dc000a5467647d99e81309292ff71a338a0 /app/src/main/res/layout
parentOnClick implemented for feed items (diff)
parentMerge branch 'app' (diff)
merge
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/item_filter.xml2
-rw-r--r--app/src/main/res/layout/item_filter_settings_keyword.xml14
2 files changed, 1 insertions, 15 deletions
diff --git a/app/src/main/res/layout/item_filter.xml b/app/src/main/res/layout/item_filter.xml
index c91a1a5..085a902 100644
--- a/app/src/main/res/layout/item_filter.xml
+++ b/app/src/main/res/layout/item_filter.xml
@@ -11,7 +11,7 @@
android:layout_height="fill_parent"
android:textSize="@dimen/font_size_large"/>
- <TextView android:id="@+id/filter_item_keywords"
+ <TextView android:id="@+id/filter_item_feeds"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:textSize="@dimen/font_size_normal"/>
diff --git a/app/src/main/res/layout/item_filter_settings_keyword.xml b/app/src/main/res/layout/item_filter_settings_keyword.xml
deleted file mode 100644
index 36d8c59..0000000
--- a/app/src/main/res/layout/item_filter_settings_keyword.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
-
- <TextView android:id="@+id/filter_settings_keyword_item_title"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:padding="10dp"
- android:textSize="@dimen/font_size_normal"/>
-
-</LinearLayout> \ No newline at end of file