Skip to content

Commit

Permalink
Submemus work again with the new support lib
Browse files Browse the repository at this point in the history
  • Loading branch information
simonpoole committed Oct 15, 2018
1 parent 75bc104 commit fe0561c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/main/java/de/blau/android/Main.java
Expand Up @@ -87,6 +87,7 @@
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.RelativeLayout.LayoutParams;
import de.blau.android.BuildConfig;
import de.blau.android.GeoUrlActivity.GeoUrlData;
import de.blau.android.Logic.CursorPaddirection;
import de.blau.android.RemoteControlUrlActivity.RemoteControlUrlData;
Expand Down Expand Up @@ -1438,7 +1439,7 @@ public boolean onCreateOptionsMenu(final Menu m) {
if (menu.size() == 0) {
menu.clear();
final MenuInflater inflater = getMenuInflater();
if (getBottomBar() != null && Util.isLarge(this) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (getBottomBar() != null && Util.isLarge(this) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && BuildConfig.FLAVOR.equals("legacy")) {
inflater.inflate(R.menu.main_menu_nosubmenus, menu);
} else {
inflater.inflate(R.menu.main_menu, menu);
Expand Down

0 comments on commit fe0561c

Please sign in to comment.