diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-04-24 15:29:07 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-04-24 15:29:07 +0300 |
| commit | c6691164970308e2092e576a3da2b0dde9dc82cc (patch) | |
| tree | b3079f4fb9c9de0464f132d6302154a59cb1c1ec /app/src/main/res/menu | |
| parent | fe993480e5454247e01086cf620546b747c77ca3 (diff) | |
| parent | 66cb747c78cdefbdfed699eedf7ca5e8c8a8459d (diff) | |
Merge branch 'master' into 395-archived-cards
# Conflicts:
# app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
# app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
# app/src/main/res/menu/main_menu.xml
# app/src/main/res/values/strings.xml
Diffstat (limited to 'app/src/main/res/menu')
| -rw-r--r-- | app/src/main/res/menu/main_menu.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml index 04449a5f0..5e42c30f4 100644 --- a/app/src/main/res/menu/main_menu.xml +++ b/app/src/main/res/menu/main_menu.xml @@ -2,6 +2,11 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> <item + android:id="@+id/filter" + android:icon="@drawable/ic_filter_list_white_24dp" + android:title="@string/simple_filter" + app:showAsAction="ifRoom" /> + <item android:id="@+id/archived_cards" android:icon="@drawable/ic_archive_white_24dp" android:title="@string/action_archived_cards" |