From ed44abf498fc4d17c9deb58e788b49b9a6c6b8cf Mon Sep 17 00:00:00 2001 From: Dana Dahlstrom Date: Tue, 22 May 2018 11:33:52 +0200 Subject: [PATCH] Refactor getDefaultViewId and add explanatory comment Close https://github.com/JetBrains/intellij-community/pull/785 --- .../com/intellij/ide/projectView/impl/ProjectViewImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java index 0fca917b1347..d4f0517b07de 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -1418,11 +1418,12 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo @NotNull public static String getDefaultViewId() { //noinspection SpellCheckingInspection - if (!"AndroidStudio".equals(PlatformUtils.getPlatformPrefix()) || Boolean.getBoolean("studio.projectview")) { - return ProjectViewPane.ID; + if ("AndroidStudio".equals(PlatformUtils.getPlatformPrefix()) && !Boolean.getBoolean("studio.projectview")) { + // the default in Android Studio unless studio.projectview is set: issuetracker.google.com/37091465 + return "AndroidView"; } else { - return "AndroidView"; + return ProjectViewPane.ID; } }