PrivacyIndicators: Not showing icons in idle state.

In idle mode, only the green dot should be showing and all the icons
should be hidden. This is to ensure that no glitches of icons will
appear in the green dot during state changes.

Change-Id: I4378792488828bf827e5ed95ee1f822d0fb15c62
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4021257
Commit-Queue: Andre Le <leandre@chromium.org>
Reviewed-by: Alex Newcomer <newcomer@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1070589}

ash/system/privacy/privacy_indicators_tray_item_view.cc

@@ -15,6 +15,7 @@
 #include "ash/style/ash_color_provider.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "base/check.h"
+#include "base/check_op.h"
 #include "base/containers/flat_set.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/time/time.h"
@@ -186,8 +187,11 @@ void PrivacyIndicatorsTrayItemView::Update(const std::string& app_id,
   if (!GetVisible())
     return;
 
-  camera_icon_->SetVisible(IsCameraUsed());
-  microphone_icon_->SetVisible(IsMicrophoneUsed());
+  camera_icon_->SetVisible(animation_state_ != AnimationState::kIdle &&
+                           IsCameraUsed());
+  microphone_icon_->SetVisible(animation_state_ != AnimationState::kIdle &&
+                               IsMicrophoneUsed());
+
   TooltipTextChanged();
   RecordPrivacyIndicatorsType();
 }
@@ -202,7 +206,8 @@ void PrivacyIndicatorsTrayItemView::UpdateScreenShareStatus(
   if (!GetVisible())
     return;
 
-  screen_share_icon_->SetVisible(is_screen_sharing_);
+  screen_share_icon_->SetVisible(animation_state_ != AnimationState::kIdle &&
+                                 is_screen_sharing_);
   TooltipTextChanged();
   RecordPrivacyIndicatorsType();
 }
@@ -257,6 +262,7 @@ void PrivacyIndicatorsTrayItemView::PerformVisibilityAnimation(bool visible) {
   // 4. kBothSideShrink: Before the long side shrinks completely, collapses the
   // short side to the final size (a green dot).
   expand_animation_->Start();
+  animation_state_ = AnimationState::kExpand;
   StartRecordAnimationSmoothness(GetWidget(), throughput_tracker_);
 
   // At the same time, fade in icons.
@@ -341,7 +347,7 @@ const char* PrivacyIndicatorsTrayItemView::GetClassName() const {
 void PrivacyIndicatorsTrayItemView::AnimationProgressed(
     const gfx::Animation* animation) {
   if (animation == expand_animation_.get()) {
-    animation_state_ = AnimationState::kExpand;
+    DCHECK_EQ(animation_state_, AnimationState::kExpand);
   } else if (animation == longer_side_shrink_animation_.get() &&
              !shorter_side_shrink_animation_->is_animating()) {
     animation_state_ = AnimationState::kOnlyLongerSideShrink;

ash/system/privacy/privacy_indicators_tray_item_view_unittest.cc

@@ -128,6 +128,10 @@ class PrivacyIndicatorsTrayItemViewTest : public AshTestBase {
   PrivacyIndicatorsTrayItemView::AnimationState animation_state() {
     return privacy_indicators_view_->animation_state_;
   }
+  void set_animation_state(
+      PrivacyIndicatorsTrayItemView::AnimationState state) {
+    privacy_indicators_view_->animation_state_ = state;
+  }
 
   gfx::LinearAnimation* longer_side_shrink_animation() {
     return privacy_indicators_view_->longer_side_shrink_animation_.get();
@@ -146,6 +150,9 @@ class PrivacyIndicatorsTrayItemViewTest : public AshTestBase {
 TEST_F(PrivacyIndicatorsTrayItemViewTest, IconsVisibility) {
   EXPECT_FALSE(privacy_indicators_view()->GetVisible());
 
+  // Set animation to expand to allow showing icons.
+  set_animation_state(PrivacyIndicatorsTrayItemView::AnimationState::kExpand);
+
   privacy_indicators_view()->Update(/*app_id=*/"app_id",
                                     /*is_camera_used=*/true,
                                     /*is_microphone_used=*/false);
@@ -176,6 +183,9 @@ TEST_F(PrivacyIndicatorsTrayItemViewTest, IconsVisibility) {
 TEST_F(PrivacyIndicatorsTrayItemViewTest, ScreenShareIconsVisibility) {
   EXPECT_FALSE(privacy_indicators_view()->GetVisible());
 
+  // Set animation to expand to allow showing icons.
+  set_animation_state(PrivacyIndicatorsTrayItemView::AnimationState::kExpand);
+
   privacy_indicators_view()->UpdateScreenShareStatus(
       /*is_screen_sharing=*/true);
   EXPECT_TRUE(privacy_indicators_view()->GetVisible());
@@ -458,6 +468,9 @@ TEST_F(PrivacyIndicatorsTrayItemViewTest, StateChangeDuringAnimation) {
 TEST_F(PrivacyIndicatorsTrayItemViewTest, MultipleAppsAccess) {
   EXPECT_FALSE(privacy_indicators_view()->GetVisible());
 
+  // Set animation to expand to allow showing icons.
+  set_animation_state(PrivacyIndicatorsTrayItemView::AnimationState::kExpand);
+
   privacy_indicators_view()->Update(/*app_id=*/"app_id1",
                                     /*is_camera_used=*/true,
                                     /*is_microphone_used=*/false);