diff options
| author | Camil Staps | 2015-05-20 12:51:55 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-05-20 12:51:55 +0200 |
| commit | f6d37c97bc6eaddfa722daa3384cff86013c40e5 (patch) | |
| tree | a731335511f52473dcbac2df07ee9dbf330e3737 /app/src/main/res/layout | |
| parent | JavaDoc (diff) | |
| parent | FilterSettingsActivity example (diff) | |
Merge branch 'app'
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_filter_settings.xml | 36 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_filter_settings_feeds.xml (renamed from app/src/main/res/layout/fragment_filter_settings_keywords.xml) | 0 |
2 files changed, 4 insertions, 32 deletions
diff --git a/app/src/main/res/layout/activity_filter_settings.xml b/app/src/main/res/layout/activity_filter_settings.xml index 4f3b177..7c8e265 100644 --- a/app/src/main/res/layout/activity_filter_settings.xml +++ b/app/src/main/res/layout/activity_filter_settings.xml @@ -4,40 +4,12 @@ tools:context="org.rssin.android.FilterSettingsActivity" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - android:paddingBottom="@dimen/activity_vertical_margin" + android:paddingLeft="0dp" + android:paddingRight="0dp" + android:paddingTop="0dp" + android:paddingBottom="0dp" android:orientation="vertical"> - <TextView - android:id="@+id/filter_settings_title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textSize="22sp" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="6dp" - android:paddingBottom="6dp" - android:orientation="horizontal"> - - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/filter_settings_edit_keywords" - android:onClick="openKeywordsDialog"/> - - <TextView - android:id="@+id/filter_settings_keywords" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:scrollbars="horizontal" - android:maxLines="1"/> - - </LinearLayout> - <ListView android:id="@+id/filter_settings_feeds_list" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/fragment_filter_settings_keywords.xml b/app/src/main/res/layout/fragment_filter_settings_feeds.xml index 418129e..418129e 100644 --- a/app/src/main/res/layout/fragment_filter_settings_keywords.xml +++ b/app/src/main/res/layout/fragment_filter_settings_feeds.xml |