[Android] Fix soft back button not working in 'About' view

Geoffrey Métais git at videolan.org
Tue Apr 2 18:31:11 CEST 2019


vlc-android | branch: 3.1.x | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Apr  2 18:30:10 2019 +0200| [9d5f4b3348ec1dea02d37d47d2ca67e607cf17cf] | committer: Geoffrey Métais

Fix soft back button not working in 'About' view

(cherry picked from commit 07850f91a7b6d3237793173935d455e9610f2248)

> https://code.videolan.org/videolan/vlc-android/commit/9d5f4b3348ec1dea02d37d47d2ca67e607cf17cf
---

 vlc-android/src/org/videolan/vlc/gui/ContentActivity.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/ContentActivity.java b/vlc-android/src/org/videolan/vlc/gui/ContentActivity.java
index 6bbf639dc..f124f4c2c 100644
--- a/vlc-android/src/org/videolan/vlc/gui/ContentActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/ContentActivity.java
@@ -97,10 +97,9 @@ public class ContentActivity extends AudioPlayerContainerActivity implements Sea
     public boolean onCreateOptionsMenu(final Menu menu) {
         if (AndroidDevices.isAndroidTv) return false;
         final Fragment current = getCurrentFragment();
-        if (current instanceof AboutFragment)
-            return false;
-        getMenuInflater().inflate(R.menu.activity_option, menu);
         super.onCreateOptionsMenu(menu);
+        if (current instanceof AboutFragment) return true;
+        getMenuInflater().inflate(R.menu.activity_option, menu);
         if (current instanceof ExtensionBrowser){
             menu.findItem(R.id.ml_menu_last_playlist).setVisible(false);
             menu.findItem(R.id.ml_menu_sortby).setVisible(false);



More information about the Android mailing list