diff options
| author | stefan-niedermann <info@niedermann.it> | 2019-02-06 19:32:42 +0300 |
|---|---|---|
| committer | stefan-niedermann <info@niedermann.it> | 2019-02-06 19:32:42 +0300 |
| commit | 3733ada12fb541557a74c85b3d8cece9bfd5f10e (patch) | |
| tree | 58ef886a6c567125b6ff929a4425af611ed5f5cc /app/src/main/res/menu | |
| parent | 065f73280e0c4757ff29aef57611e98c68a10a71 (diff) | |
| parent | 8d7d284cd8933bb50abd2f25c8eab386945296be (diff) | |
Merge branch 'master' into search-in-note
# Conflicts:
# app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java
Diffstat (limited to 'app/src/main/res/menu')
| -rw-r--r-- | app/src/main/res/menu/menu_list_view.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/menu/menu_note_fragment.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/res/menu/menu_list_view.xml b/app/src/main/res/menu/menu_list_view.xml index 957c6574..70103414 100644 --- a/app/src/main/res/menu/menu_list_view.xml +++ b/app/src/main/res/menu/menu_list_view.xml @@ -7,6 +7,6 @@ android:id="@+id/search" android:title="@string/action_search" android:icon="@drawable/ic_search_white_24dp" - app:actionViewClass="android.support.v7.widget.SearchView" + app:actionViewClass="androidx.appcompat.widget.SearchView" app:showAsAction="collapseActionView|always" /> </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/menu_note_fragment.xml b/app/src/main/res/menu/menu_note_fragment.xml index 9a5a9ada..e58c466f 100644 --- a/app/src/main/res/menu/menu_note_fragment.xml +++ b/app/src/main/res/menu/menu_note_fragment.xml @@ -28,7 +28,7 @@ android:orderInCategory="100" android:title="@string/menu_share" app:showAsAction="never" - app:actionProviderClass="android.support.v7.widget.ShareActionProvider" /> + app:actionProviderClass="androidx.appcompat.widget.ShareActionProvider" /> <item android:id="@+id/menu_cancel" android:icon="@drawable/ic_clear_white_24dp" |