diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-11-05 00:00:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-05 00:00:00 +0000 |
| commit | 57d972656487b31c26063caaab4b16a022449557 (patch) | |
| tree | b3240da67f4349f4d7ed5c62cf0d77ef73f3bdc5 | |
| parent | 5e3982ff92cd48289a8819fe3310fe1b179291fd (diff) | |
| parent | 7b4bc46a536dc4cab3e83552307e0a83de1060ba (diff) | |
| download | qemu-snap-temp-L86700000735594360.tar.gz | |
Merge "Merge cherrypicks of [1486495] into emu-30-release" into emu-30-releasesnap-temp-L86700000735594360snap-temp-L12700000735599309
| -rw-r--r-- | android/android-emu/android/skin/qt/tool-window.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/android/android-emu/android/skin/qt/tool-window.cpp b/android/android-emu/android/skin/qt/tool-window.cpp index 4fe7ed85f2..a9e53f621b 100644 --- a/android/android-emu/android/skin/qt/tool-window.cpp +++ b/android/android-emu/android/skin/qt/tool-window.cpp @@ -586,7 +586,9 @@ void ToolWindow::handleUICommand(QtUICommand cmd, bool down, std::string extra) case QtUICommand::SHOW_PANE_MULTIDISPLAY: if (down) { if (android::featurecontrol::isEnabled(android::featurecontrol::MultiDisplay) - && !android_foldable_any_folded_area_configured()) { + && !android_foldable_any_folded_area_configured() + && !android_foldable_hinge_configured() + && !android_foldable_rollable_configured()) { showOrRaiseExtendedWindow(PANE_IDX_MULTIDISPLAY); } } |