Commit d30c42fc authored by jonross's avatar jonross Committed by Commit bot

Revert Disable Rotation on Login Pages

Revert "This change is intended to M-43. Currently screen rotation animations expose a bug, causing the login screen to not be useable.

Disable rotation animations while a user is not logged in. This will be later reverted on M-44 where a fix to the underlying issue will be landed."

This reverts commit 274e83a4.
Original review: https://codereview.chromium.org/1139793003/

The underlying bug was fixed via: https://codereview.chromium.org/1125283015/

TBR=oshima@chromium.org
BUG=chrome-os-partner:40118

Review URL: https://codereview.chromium.org/1145963003

Cr-Commit-Position: refs/heads/master@{#330737}
parent 5548199b
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include "ash/display/display_info.h" #include "ash/display/display_info.h"
#include "ash/display/display_manager.h" #include "ash/display/display_manager.h"
#include "ash/rotator/screen_rotation_animation.h" #include "ash/rotator/screen_rotation_animation.h"
#include "ash/session/session_state_delegate.h"
#include "ash/shell.h" #include "ash/shell.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/time/time.h" #include "base/time/time.h"
...@@ -281,19 +280,10 @@ ScreenRotationAnimator::~ScreenRotationAnimator() { ...@@ -281,19 +280,10 @@ ScreenRotationAnimator::~ScreenRotationAnimator() {
} }
bool ScreenRotationAnimator::CanAnimate() const { bool ScreenRotationAnimator::CanAnimate() const {
// Animations are currently broken on the login screen.
// (chrome-os-partners:40118). Disabling the animations on this screen for
// M-43
return Shell::GetInstance() return Shell::GetInstance()
->display_manager() ->display_manager()
->GetDisplayForId(display_id_) ->GetDisplayForId(display_id_)
.is_valid() && .is_valid();
Shell::GetInstance()
->session_state_delegate()
->IsActiveUserSessionStarted() &&
!Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
Shell::GetInstance()->session_state_delegate()->GetSessionState() ==
SessionStateDelegate::SESSION_STATE_ACTIVE;
} }
void ScreenRotationAnimator::Rotate(gfx::Display::Rotation new_rotation, void ScreenRotationAnimator::Rotate(gfx::Display::Rotation new_rotation,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment