diff options
| author | Alex Ning <chineseperson5@gmail.com> | 2020-06-16 07:17:00 +0000 |
|---|---|---|
| committer | Alex Ning <chineseperson5@gmail.com> | 2020-06-16 07:17:00 +0000 |
| commit | 88a21195860bb99ab3cbc4b992b1d57bc016fcb4 (patch) | |
| tree | 7d90ca137b8cb9afd64bd258df0287696aaf812d /app/src/main/res/menu | |
| parent | 268ea4f9d882b4475d808a8452137f3629738dcb (diff) | |
| download | infinity-for-reddit-88a21195860bb99ab3cbc4b992b1d57bc016fcb4.tar infinity-for-reddit-88a21195860bb99ab3cbc4b992b1d57bc016fcb4.tar.gz infinity-for-reddit-88a21195860bb99ab3cbc4b992b1d57bc016fcb4.tar.bz2 infinity-for-reddit-88a21195860bb99ab3cbc4b992b1d57bc016fcb4.tar.lz infinity-for-reddit-88a21195860bb99ab3cbc4b992b1d57bc016fcb4.tar.xz infinity-for-reddit-88a21195860bb99ab3cbc4b992b1d57bc016fcb4.tar.zst infinity-for-reddit-88a21195860bb99ab3cbc4b992b1d57bc016fcb4.zip | |
Resolve conflicts: Some refactors on media activities.
Diffstat (limited to 'app/src/main/res/menu')
| -rw-r--r-- | app/src/main/res/menu/view_gif_activity.xml | 17 | ||||
| -rw-r--r-- | app/src/main/res/menu/view_image_or_gif_activity.xml (renamed from app/src/main/res/menu/view_image_activity.xml) | 13 |
2 files changed, 7 insertions, 23 deletions
diff --git a/app/src/main/res/menu/view_gif_activity.xml b/app/src/main/res/menu/view_gif_activity.xml deleted file mode 100644 index 0dc5aba5..00000000 --- a/app/src/main/res/menu/view_gif_activity.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?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"> - <item - android:id="@+id/action_download_view_gif_activity" - android:orderInCategory="1" - android:title="@string/action_download" - android:icon="@drawable/ic_file_download_toolbar_white_24dp" - app:showAsAction="ifRoom" /> - - <item - android:id="@+id/action_share_view_gif_activity" - android:orderInCategory="2" - android:title="@string/action_share" - android:icon="@drawable/ic_share_toolbar_white_24dp" - app:showAsAction="ifRoom" /> -</menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/view_image_activity.xml b/app/src/main/res/menu/view_image_or_gif_activity.xml index 0c080ae9..682516a4 100644 --- a/app/src/main/res/menu/view_image_activity.xml +++ b/app/src/main/res/menu/view_image_or_gif_activity.xml @@ -2,22 +2,23 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> <item - android:id="@+id/action_download_view_image_activity" + android:id="@+id/action_download_view_image_or_gif_activity" + android:icon="@drawable/ic_file_download_toolbar_white_24dp" android:orderInCategory="1" android:title="@string/action_download" - android:icon="@drawable/ic_file_download_toolbar_white_24dp" app:showAsAction="ifRoom" /> <item - android:id="@+id/action_share_view_image_activity" + android:id="@+id/action_share_view_image_or_gif_activity" + android:icon="@drawable/ic_share_toolbar_white_24dp" android:orderInCategory="2" android:title="@string/action_share" - android:icon="@drawable/ic_share_toolbar_white_24dp" app:showAsAction="ifRoom" /> <item - android:id="@+id/action_set_wallpaper_view_image_activity" + android:id="@+id/action_set_wallpaper_view_image_or_gif_activity" android:orderInCategory="3" android:title="@string/action_set_wallpaper" + android:visible="false" app:showAsAction="never" /> -</menu>
\ No newline at end of file +</menu> |