From 1157903a225a1dc1e1cdc6636920fe34f628f1da Mon Sep 17 00:00:00 2001
From: Anastasia Ivanova <anastasia.ivanova@jetbrains.com>
Date: Sun, 19 Jan 2020 10:38:17 +0700
Subject: [PATCH] IDEA-CR-57331: FUS: cleanup FeatureUsageStatistics menu,
 scale icon size (IDEA-227884)

GitOrigin-RevId: ac82370bb7aa1b33327f19c3f43271ffbb7a8a1d
---
 .../platform-resources/src/idea/StatisticsEventLog.xml | 10 +++++-----
 .../statistic/actions/OpenLocalWhitelistFileAction.kt  |  7 ++++---
 resources/src/idea/JavaActions.xml                     |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/platform/platform-resources/src/idea/StatisticsEventLog.xml b/platform/platform-resources/src/idea/StatisticsEventLog.xml
index 301aab0df3ed..d394d5651a9b 100644
--- a/platform/platform-resources/src/idea/StatisticsEventLog.xml
+++ b/platform/platform-resources/src/idea/StatisticsEventLog.xml
@@ -9,13 +9,13 @@
               class="com.intellij.internal.statistic.actions.AddTestGroupToLocalWhitelistAction"/>
       <action internal="true" id="CleanupLocalWhitelistAction"
               class="com.intellij.internal.statistic.actions.CleanupLocalWhitelistAction"/>
-      <action internal="true" id="OpenLocalWhitelistFileAction" class="com.intellij.internal.statistic.actions.OpenLocalWhitelistFileAction"/>
-      <action internal="true" id="ConfigureWhitelistAction" class="com.intellij.internal.statistic.actions.ConfigureWhitelistAction"/>
-      <action internal="true" id="OpenWhitelistFileAction" class="com.intellij.internal.statistic.actions.OpenWhitelistFileAction"/>
-      <group internal="true" id="OpenEventLogFileAction" class="com.intellij.internal.statistic.groups.OpenEventLogFileActionGroup"/>
-      <group internal="true" id="CleanupEventLog" class="com.intellij.internal.statistic.groups.CleanupEventLogByIdActionGroup"/>
       <add-to-group group-id="Internal" anchor="last"/>
     </group>
     <action internal="true" id="SendEventLogStatistics" class="com.intellij.internal.statistic.actions.SendEventLogAction"/>
+    <action internal="true" id="OpenLocalWhitelistFileAction" class="com.intellij.internal.statistic.actions.OpenLocalWhitelistFileAction"/>
+    <action internal="true" id="ConfigureWhitelistAction" class="com.intellij.internal.statistic.actions.ConfigureWhitelistAction"/>
+    <action internal="true" id="OpenWhitelistFileAction" class="com.intellij.internal.statistic.actions.OpenWhitelistFileAction"/>
+    <group internal="true" id="OpenEventLogFileAction" class="com.intellij.internal.statistic.groups.OpenEventLogFileActionGroup"/>
+    <group internal="true" id="CleanupEventLog" class="com.intellij.internal.statistic.groups.CleanupEventLogByIdActionGroup"/>
   </actions>
 </idea-plugin>
\ No newline at end of file
diff --git a/platform/statistics/devkit/src/com/intellij/internal/statistic/actions/OpenLocalWhitelistFileAction.kt b/platform/statistics/devkit/src/com/intellij/internal/statistic/actions/OpenLocalWhitelistFileAction.kt
index cd7269aba949..c34d67ee0235 100644
--- a/platform/statistics/devkit/src/com/intellij/internal/statistic/actions/OpenLocalWhitelistFileAction.kt
+++ b/platform/statistics/devkit/src/com/intellij/internal/statistic/actions/OpenLocalWhitelistFileAction.kt
@@ -27,9 +27,10 @@ class OpenLocalWhitelistFileAction(private val myRecorderId: String = "FUS")
   override fun update(e: AnActionEvent) {
     val localWhitelistSize = WhitelistTestGroupStorage.getInstance(myRecorderId).size()
     val text = if (localWhitelistSize < 100) localWhitelistSize.toString() else "99+"
-    val sizeCountIcon = TextIcon(text, JBColor.DARK_GRAY, UIUtil.getLabelBackground(), 2)
-    sizeCountIcon.setFont(Font(UIUtil.getLabelFont().name, Font.BOLD, JBUIScale.scale(10)))
-    ICON.setIcon(sizeCountIcon, 2, 20, 18)
+    val sizeCountIcon = TextIcon(text, JBColor.DARK_GRAY, UIUtil.getLabelBackground(), 1)
+    sizeCountIcon.setFont(Font(UIUtil.getLabelFont().name, Font.BOLD, JBUIScale.scale(9)))
+    sizeCountIcon.setInsets(1, 1, 0, 0)
+    ICON.setIcon(sizeCountIcon, 2, JBUIScale.scale(10), JBUIScale.scale(10))
     e.presentation.icon = ICON
   }
 
diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml
index b79f7c5f5a61..70df0c0e7455 100644
--- a/resources/src/idea/JavaActions.xml
+++ b/resources/src/idea/JavaActions.xml
@@ -156,6 +156,7 @@
 
     <action internal="true" id="CollectFUStatisticsAction"
             class="com.intellij.internal.statistic.actions.CollectFUStatisticsAction">
+      <add-to-group group-id="FeatureUsage.Internal" anchor="last"/>
     </action>
 
     <!-- Help -->