diff options
| author | Camil Staps | 2015-05-21 16:04:57 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-05-21 16:04:57 +0200 |
| commit | 68e4893da5d6411349b855dd1a003d62a6029fc7 (patch) | |
| tree | 02e26defb8c18a3fb22a4c988012612effefe848 /app/src/main/res | |
| parent | Merge branch 'app' (diff) | |
| parent | Delete filters (diff) | |
Merge branch 'app'
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/menu/menu_filter_settings.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app/src/main/res/menu/menu_filter_settings.xml b/app/src/main/res/menu/menu_filter_settings.xml index a6a518b..848c9df 100644 --- a/app/src/main/res/menu/menu_filter_settings.xml +++ b/app/src/main/res/menu/menu_filter_settings.xml @@ -8,13 +8,16 @@ <item android:id="@+id/filter_settings_action_feeds" android:title="@string/filter_settings_action_feeds" - android:orderInCategory="100" app:showAsAction="ifRoom" /> <item android:id="@+id/filter_settings_action_title" - android:title="@string/filter_settinsg_action_title" - android:orderInCategory="100" + android:title="@string/filter_settings_action_title" app:showAsAction="ifRoom" /> + <item + android:id="@+id/filter_settings_action_delete" + android:title="@string/filter_settings_action_delete" + app:showAsAction="never" /> + </menu> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5db8c1d..e545ac2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,8 +16,10 @@ <string name="filter_settings_feeds">Feeds</string> <string name="filter_settings_add_keyword">Add</string> <string name="filter_settings_action_feeds">Feeds</string> - <string name="filter_settinsg_action_title">Title</string> + <string name="filter_settings_action_title">Title</string> + <string name="filter_settings_action_delete">Delete</string> <string name="error_save_filters">Couldn\'t save filter</string> <string name="error_load_filters">Couldn\'t load filters</string> + <string name="error_delete_filter">Couldn\'t delete filter</string> </resources> |