diff options
author | BogDan Vatra <bogdan@kde.org> | 2013-12-23 18:08:04 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-02 20:21:41 +0100 |
commit | f9a47a6aa5a83a872c38173d10f9c29a81a2bd27 (patch) | |
tree | 56f5990190e4e58b3f94d2f82966ca14a15394f8 | |
parent | 2e8c3f744407607a522abe25abd21ec733365793 (diff) |
Android: Don't show ActionBar at startup.
Task-number: QTBUG-35151
Change-Id: Ie62e50032aaa647a86c4f03b1a3363e5ef6a1bbb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
-rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 6 | ||||
-rw-r--r-- | src/plugins/platforms/android/src/androidjnimenu.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java index 3bcd6eaea3..6198baeedc 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -348,6 +348,7 @@ public class QtActivityDelegate } m_activity = activity; + setActionBarVisibility(false); QtNative.setActivity(m_activity, this); QtNative.setClassLoader(classLoader); if (loaderParams.containsKey(STATIC_INIT_CLASSES_KEY)) { @@ -412,7 +413,6 @@ public class QtActivityDelegate m_applicationParameters = loaderParams.getString(APPLICATION_PARAMETERS_KEY); else m_applicationParameters = ""; - setActionBarVisibility(false); return true; } @@ -816,8 +816,7 @@ public class QtActivityDelegate { m_opionsMenuIsVisible = true; boolean res = QtNative.onPrepareOptionsMenu(menu); - if (!res || menu.size() == 0) - setActionBarVisibility(false); + setActionBarVisibility(res && menu.size() > 0); return res; } @@ -834,7 +833,6 @@ public class QtActivityDelegate public void resetOptionsMenu() { - setActionBarVisibility(true); if (Build.VERSION.SDK_INT > 10) { try { Activity.class.getMethod("invalidateOptionsMenu").invoke(m_activity); diff --git a/src/plugins/platforms/android/src/androidjnimenu.cpp b/src/plugins/platforms/android/src/androidjnimenu.cpp index 293af2b9cd..dbdd7c9b8e 100644 --- a/src/plugins/platforms/android/src/androidjnimenu.cpp +++ b/src/plugins/platforms/android/src/androidjnimenu.cpp @@ -156,11 +156,11 @@ namespace QtAndroidMenu foreach (QAndroidPlatformMenuBar *menuBar, menuBars) { if (menuBar->parentWindow() == window) { visibleMenuBar = menuBar; + resetMenuBar(); break; } } - resetMenuBar(); } void addMenuBar(QAndroidPlatformMenuBar *menuBar) |