Snap for 8962753 from 38df2b049434a5235a9868dab49afa48b2e026da to studio-ee-releasestudio-2022.1.1-canarystudio-canarystudio-2022.1.1-canary

Change-Id: I88381d15e06150ab221be99c9d4cbe88ff649372

6 files changed, 18 insertions, 18 deletions

diff --git a/adt-branding/src/artwork/studio_splash.png b/adt-branding/src/artwork/studio_splash.png
index 84b73038b31a..d2d5d39b0249 100644
--- a/adt-branding/src/artwork/studio_splash.png
+++ b/adt-branding/src/artwork/studio_splash.png
diff --git a/adt-branding/src/artwork/studio_splash@2x.png b/adt-branding/src/artwork/studio_splash@2x.png
index 0247a1b3c237..5050ca141d21 100644
--- a/adt-branding/src/artwork/studio_splash@2x.png
+++ b/adt-branding/src/artwork/studio_splash@2x.png
diff --git a/build/groovy/org/jetbrains/intellij/build/AndroidStudioBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/AndroidStudioBuilder.groovy
index a734f7bd6811..72ba1cf8f3db 100644
--- a/build/groovy/org/jetbrains/intellij/build/AndroidStudioBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/AndroidStudioBuilder.groovy
@@ -34,6 +34,6 @@ class AndroidStudioBuilder {
   void buildDistributions() {
     def tasks = BuildTasks.create(buildContext)
     tasks.buildDistributions()
-    tasks.buildUpdaterJar()
+    tasks.buildFullUpdaterJar()
   }
 }
\ No newline at end of file
diff --git a/build_studio.sh b/build_studio.sh
index f01392b4f77c..913674b7922c 100755
--- a/build_studio.sh
+++ b/build_studio.sh
@@ -11,19 +11,11 @@ function die() {
   exit 1
 }
 
-function get_absolute_path() {
-  ( unset CDPATH; cd "$1" && pwd ) 2> /dev/null
-}
-
-OUT="${OUT_DIR:-out/studio}"
+OUT="${OUT_DIR:-${PROG_DIR}/out/studio}"
 DIST="${DIST_DIR:-"${OUT}/dist"}"
 
-cd "$PROG_DIR"
 mkdir -p "$OUT"
 mkdir -p "$DIST"
-# ensure OUT and DIST are absolute paths
-OUT="$(get_absolute_path "$OUT")"
-DIST="$(get_absolute_path "$DIST")"
 
 INCREMENTAL=false
 while [[ $# -gt 0 ]]; do
@@ -35,7 +27,7 @@ while [[ $# -gt 0 ]]; do
   shift
 done
 
-readonly AS_BUILD_NUMBER="$(sed "s/SNAPSHOT/__BUILD_NUMBER__/" build.txt)"
+readonly AS_BUILD_NUMBER="$(sed "s/SNAPSHOT/__BUILD_NUMBER__/" "${PROG_DIR}/build.txt")"
 
 declare -ar BUILD_PROPERTIES=(
   "-Dintellij.build.output.root=${OUT}"
@@ -48,8 +40,6 @@ declare -ar BUILD_PROPERTIES=(
 
 "${PROG_DIR}/platform/jps-bootstrap/jps-bootstrap.sh" "${BUILD_PROPERTIES[@]}" "${PROG_DIR}" intellij.idea.community.build AndroidStudioBuildTarget
 
-"${PROG_DIR}/platform/jps-bootstrap/jps-bootstrap.sh" "-Dintellij.build.output.root=${OUT}/updater" "${PROG_DIR}" intellij.idea.community.build FullUpdaterBuildTarget
-
 mkdir -p "$DIST"
 cp -Rfv "$OUT"/artifacts/android-studio* "$DIST"
-cp -Rfv "$OUT"/updater/artifacts/updater-full.jar "$DIST"/updater-full.jar
+cp -Rfv "$OUT"/artifacts/updater-full.jar "$DIST"
diff --git a/platform/platform-impl/src/com/intellij/ide/util/TipDialog.java b/platform/platform-impl/src/com/intellij/ide/util/TipDialog.java
index 8cf081fe6d5f..e6a7bb811f1d 100644
--- a/platform/platform-impl/src/com/intellij/ide/util/TipDialog.java
+++ b/platform/platform-impl/src/com/intellij/ide/util/TipDialog.java
@@ -10,6 +10,7 @@ import com.intellij.openapi.fileChooser.FileChooserFactory;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.LocalFileSystem;
@@ -99,6 +100,7 @@ public final class TipDialog extends DialogWrapper {
       ourInstance.dispose();
     }
     ourInstance = new TipDialog(w, project);
+    Disposer.register(ourInstance.getDisposable(), () -> ourInstance = null);
     ourInstance.show();
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PowerSaveStatusWidgetFactory.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PowerSaveStatusWidgetFactory.java
index 5061d9edfde7..dfa647682e66 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PowerSaveStatusWidgetFactory.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PowerSaveStatusWidgetFactory.java
@@ -6,6 +6,7 @@ import com.intellij.icons.AllIcons;
 import com.intellij.ide.PowerSaveMode;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.wm.StatusBar;
 import com.intellij.openapi.wm.StatusBarWidget;
 import com.intellij.openapi.wm.StatusBarWidgetFactory;
@@ -24,6 +25,17 @@ import java.awt.event.MouseEvent;
 public class PowerSaveStatusWidgetFactory implements StatusBarWidgetFactory {
   private static final String ID = "PowerSaveMode";
 
+  public PowerSaveStatusWidgetFactory() {
+    ApplicationManager.getApplication().getMessageBus().connect().subscribe(PowerSaveMode.TOPIC, () -> {
+      for (Project project : ProjectManager.getInstance().getOpenProjects()) {
+        StatusBar statusBar = WindowManager.getInstance().getStatusBar(project);
+        if (statusBar != null) {
+          statusBar.updateWidget(getId());
+        }
+      }
+    });
+  }
+
   @Override
   public @NotNull String getId() {
     return ID;
@@ -42,10 +54,6 @@ public class PowerSaveStatusWidgetFactory implements StatusBarWidgetFactory {
 
   @Override
   public @NotNull StatusBarWidget createWidget(@NotNull Project project) {
-    StatusBar statusBar = WindowManager.getInstance().getStatusBar(project);
-    if (statusBar != null) {
-      ApplicationManager.getApplication().getMessageBus().connect().subscribe(PowerSaveMode.TOPIC, () -> statusBar.updateWidget(getId()));
-    }
     return new PowerWidget();
   }