diff options
| author | Camil Staps | 2015-05-19 16:11:31 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-05-19 16:11:31 +0200 |
| commit | 31ff0490790e37aa6d1bf796abc5b542628703f3 (patch) | |
| tree | bac55c15c353d2d06108de7348fcb2376cc8031d /app/src/main/res/menu | |
| parent | Merge branch 'master' into app (diff) | |
Added filters in option menu; removed option menu from filteractivity
Diffstat (limited to 'app/src/main/res/menu')
| -rw-r--r-- | app/src/main/res/menu/menu_filters.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/menu/menu_unified_inbox.xml | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/app/src/main/res/menu/menu_filters.xml b/app/src/main/res/menu/menu_filters.xml deleted file mode 100644 index 0f6a87f..0000000 --- a/app/src/main/res/menu/menu_filters.xml +++ /dev/null @@ -1,7 +0,0 @@ -<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="org.rssin.android.FiltersActivity"> - <item android:id="@+id/action_settings" android:title="@string/action_settings" - android:orderInCategory="100" app:showAsAction="never" /> -</menu> diff --git a/app/src/main/res/menu/menu_unified_inbox.xml b/app/src/main/res/menu/menu_unified_inbox.xml index 2c72c6d..2800171 100644 --- a/app/src/main/res/menu/menu_unified_inbox.xml +++ b/app/src/main/res/menu/menu_unified_inbox.xml @@ -1,6 +1,9 @@ <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=".UnifiedInboxActivity"> + <item android:id="@+id/action_settings" android:title="@string/action_settings" android:orderInCategory="100" app:showAsAction="never" /> + <item android:id="@+id/action_filters" android:title="@string/action_filters" + android:orderInCategory="100" app:showAsAction="never" /> </menu> |