Polish lock animation - launcher should do a fade out.

ash/wm/power_button_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/power_button_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/cursor_manager.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 77 matching lines @@
           PowerButtonController::ANIMATION_SLOW_CLOSE));
   EXPECT_TRUE(test_api_->BlackLayerIsVisible());
   EXPECT_FALSE(test_api_->hide_black_layer_timer_is_running());
   EXPECT_FALSE(test_api_->lock_timer_is_running());
   EXPECT_EQ(1, delegate_->num_lock_requests());
 
   // Notify that we locked successfully.
   controller_->OnStartingLock();
   EXPECT_TRUE(
       test_api_->ContainersAreAnimated(
+          PowerButtonController::LAUNCHER,
+          PowerButtonController::ANIMATION_HIDE));
+  EXPECT_TRUE(
+      test_api_->ContainersAreAnimated(
           PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
           PowerButtonController::ANIMATION_FAST_CLOSE));
   EXPECT_TRUE(
       test_api_->ContainersAreAnimated(
           PowerButtonController::LOCK_SCREEN_CONTAINERS,
           PowerButtonController::ANIMATION_HIDE));
 
   // Notify that the lock window is visible.  We should make it fade in.
   controller_->OnLockStateChanged(true);
   EXPECT_TRUE(
@@ skipping 84 matching lines @@
 
   // Press the button again and make the shutdown timeout fire this time.
   // Check that we start the timer for actually requesting the shutdown.
   controller_->OnPowerButtonEvent(true, base::TimeTicks::Now());
   EXPECT_TRUE(test_api_->shutdown_timer_is_running());
   test_api_->trigger_shutdown_timeout();
   EXPECT_TRUE(test_api_->real_shutdown_timer_is_running());
   EXPECT_EQ(0, delegate_->num_shutdown_requests());
   EXPECT_TRUE(
       test_api_->ContainersAreAnimated(
-          PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
+          PowerButtonController::LAUNCHER |
+              PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
           PowerButtonController::ANIMATION_HIDE));
   EXPECT_TRUE(
       test_api_->ContainersAreAnimated(
           PowerButtonController::GetAllLockScreenContainersMask(),
           PowerButtonController::ANIMATION_FAST_CLOSE));
 
   // When the timout fires, we should request a shutdown.
   test_api_->trigger_real_shutdown_timeout();
   EXPECT_EQ(1, delegate_->num_shutdown_requests());
 }
@@ skipping 46 matching lines @@
   EXPECT_TRUE(
       test_api_->ContainersAreAnimated(
           PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
           PowerButtonController::ANIMATION_SLOW_CLOSE));
   EXPECT_TRUE(test_api_->BlackLayerIsVisible());
 
   // Notify that we locked successfully.
   controller_->OnStartingLock();
   EXPECT_TRUE(
       test_api_->ContainersAreAnimated(
+          PowerButtonController::LAUNCHER,
+          PowerButtonController::ANIMATION_HIDE));
+  EXPECT_TRUE(
+      test_api_->ContainersAreAnimated(
           PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
           PowerButtonController::ANIMATION_FAST_CLOSE));
   EXPECT_TRUE(
       test_api_->ContainersAreAnimated(
           PowerButtonController::LOCK_SCREEN_CONTAINERS,
           PowerButtonController::ANIMATION_HIDE));
 
   // Notify that the lock window is visible.  We should make it fade in.
   controller_->OnLockStateChanged(true);
   EXPECT_TRUE(
       test_api_->ContainersAreAnimated(
           PowerButtonController::GetAllLockScreenContainersMask(),
           PowerButtonController::ANIMATION_FADE_IN));
 
   // When we release the power button, the lock-to-shutdown timer should be
   // stopped.
   EXPECT_TRUE(test_api_->lock_to_shutdown_timer_is_running());
   controller_->OnPowerButtonEvent(false, base::TimeTicks::Now());
   EXPECT_FALSE(test_api_->lock_to_shutdown_timer_is_running());
 
   // Notify that the screen has been unlocked.  We should show the
   // non-screen-locker windows and hide the black layer.
   controller_->OnLockStateChanged(false);
   EXPECT_TRUE(
       test_api_->ContainersAreAnimated(
           PowerButtonController::DESKTOP_BACKGROUND |
+          PowerButtonController::LAUNCHER |
           PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
           PowerButtonController::ANIMATION_RESTORE));
   EXPECT_FALSE(test_api_->BlackLayerIsVisible());
 }
 
 // Hold the power button down from the unlocked state to eventual shutdown.
 TEST_F(PowerButtonControllerTest, LockToShutdown) {
   controller_->set_has_legacy_power_button_for_test(false);
   controller_->OnLoginStateChanged(user::LOGGED_IN_USER);
   controller_->OnLockStateChanged(false);
@@ skipping 32 matching lines @@
 
   controller_->set_has_legacy_power_button_for_test(false);
   controller_->OnLoginStateChanged(user::LOGGED_IN_USER);
   controller_->OnLockStateChanged(false);
 
   // Hold the power button and lock the screen.
   controller_->OnPowerButtonEvent(true, base::TimeTicks::Now());
   EXPECT_TRUE(test_api_->lock_timer_is_running());
   EXPECT_TRUE(
       test_api_->ContainersAreAnimated(
+          PowerButtonController::DESKTOP_BACKGROUND |
+          PowerButtonController::LAUNCHER |
           PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
           PowerButtonController::ANIMATION_RESTORE));
   EXPECT_TRUE(test_api_->BlackLayerIsVisible());
   test_api_->trigger_lock_timeout();
   EXPECT_EQ(1, delegate_->num_lock_requests());
   EXPECT_TRUE(test_api_->lock_fail_timer_is_running());
 
   // We shouldn't start the lock-to-shutdown timer until the screen has actually
   // been locked.
   EXPECT_FALSE(test_api_->lock_to_shutdown_timer_is_running());
@@ skipping 240 matching lines @@
 
   // After increasing the brightness to 10%, we should start the timer like
   // usual.
   controller_->OnScreenBrightnessChanged(10.0);
   controller_->OnPowerButtonEvent(true, base::TimeTicks::Now());
   EXPECT_TRUE(test_api_->lock_timer_is_running());
 }
 
 }  // namespace test
 }  // namespace ash