diff options
| author | Camil Staps | 2015-05-21 16:00:17 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-05-21 16:00:17 +0200 |
| commit | 1d21b14231f3e14f43216625b94e4f689cf16ae0 (patch) | |
| tree | ed210fef92e932e37e95bb909c585a80ac68e134 /app/src/main/res | |
| parent | This wasn't committed for some reason. (diff) | |
| parent | Rotation fixes & more (diff) | |
Merge branch 'app'
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/menu/menu_filters.xml | 14 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/app/src/main/res/menu/menu_filters.xml b/app/src/main/res/menu/menu_filters.xml new file mode 100644 index 0000000..5973bd0 --- /dev/null +++ b/app/src/main/res/menu/menu_filters.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:context=".FilterSettingsActivity"> + + <item + android:id="@+id/filters_action_add" + android:title="@string/filters_action_add" + android:orderInCategory="100" + app:showAsAction="ifRoom" /> + +</menu> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3481bbc..5db8c1d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,6 +10,8 @@ <string name="title_activity_filters">Filters</string> <string name="title_activity_filter_settings">Filter</string> + <string name="filters_action_add">Add</string> + <string name="filter_settings_edit_keywords">Edit</string> <string name="filter_settings_feeds">Feeds</string> <string name="filter_settings_add_keyword">Add</string> |