[merge to M59] cros: Update rotation lock UI

ash/system/rotation/tray_rotation_lock.cc

 // Copyright 2014 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/system/rotation/tray_rotation_lock.h"
 
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
+#include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/tray/actionable_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tri_view.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
+#include "ui/display/manager/managed_display_info.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace ash {
 
 namespace {
 
 bool IsMaximizeModeWindowManagerEnabled() {
   return Shell::Get()
       ->maximize_mode_controller()
       ->IsMaximizeModeWindowManagerEnabled();
 }
 
 bool IsUserRotationLocked() {
   return Shell::Get()->screen_orientation_controller()->user_rotation_locked();
 }
 
+bool IsCurrentRotationPortrait() {
+  display::Display::Rotation current_rotation =
+      ShellPort::Get()
+          ->GetDisplayInfo(display::Display::InternalDisplayId())
+          .GetActiveRotation();
+  return current_rotation == display::Display::ROTATE_90 ||
+         current_rotation == display::Display::ROTATE_270;
+}
+
 }  // namespace
 
 namespace tray {
 
 class RotationLockDefaultView : public ActionableView,
                                 public ShellObserver,
                                 public ScreenOrientationController::Observer {
  public:
   explicit RotationLockDefaultView(SystemTrayItem* owner);
   ~RotationLockDefaultView() override;
@@ skipping 45 matching lines @@
     Shell::Get()->screen_orientation_controller()->AddObserver(this);
 }
 
 RotationLockDefaultView::~RotationLockDefaultView() {
   StopObservingRotation();
   Shell::Get()->RemoveShellObserver(this);
 }
 
 void RotationLockDefaultView::Update() {
   TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
-  icon_->SetImage(gfx::CreateVectorIcon(IsUserRotationLocked()
-                                            ? kSystemMenuRotationLockLockedIcon
-                                            : kSystemMenuRotationLockAutoIcon,
-                                        kMenuIconSize, style.GetIconColor()));
-
-  base::string16 label = l10n_util::GetStringUTF16(
-      IsUserRotationLocked() ? IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LOCKED
-                             : IDS_ASH_STATUS_TRAY_ROTATION_LOCK_AUTO);
+  base::string16 label;
+  if (IsUserRotationLocked()) {
+    icon_->SetImage(gfx::CreateVectorIcon(
+        IsCurrentRotationPortrait() ? kSystemMenuRotationLockPortraitIcon
+                                    : kSystemMenuRotationLockLandscapeIcon,
+        kMenuIconSize, style.GetIconColor()));
+    label = l10n_util::GetStringUTF16(
+        IsCurrentRotationPortrait()
+            ? IDS_ASH_STATUS_TRAY_ROTATION_LOCK_PORTRAIT
+            : IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LANDSCAPE);
+  } else {
+    icon_->SetImage(gfx::CreateVectorIcon(kSystemMenuRotationLockAutoIcon,
+                                          kMenuIconSize, style.GetIconColor()));
+    label = l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ROTATION_LOCK_AUTO);
+  }
   label_->SetText(label);
   style.SetupLabel(label_);
 
   Layout();
   SchedulePaint();
 }
 
 void RotationLockDefaultView::StopObservingRotation() {
   ScreenOrientationController* controller =
       Shell::Get()->screen_orientation_controller();
@@ skipping 34 matching lines @@
                     kSystemTrayRotationLockLockedIcon,
                     UMA_ROTATION_LOCK) {
   Shell::Get()->AddShellObserver(this);
 }
 
 TrayRotationLock::~TrayRotationLock() {
   Shell::Get()->RemoveShellObserver(this);
 }
 
 void TrayRotationLock::OnUserRotationLockChanged() {
-  tray_view()->SetVisible(ShouldBeVisible());
+  UpdateTrayImage();
 }
 
 views::View* TrayRotationLock::CreateDefaultView(LoginStatus status) {
   if (OnPrimaryDisplay())
     return new tray::RotationLockDefaultView(this);
   return nullptr;
 }
 
 void TrayRotationLock::OnMaximizeModeStarted() {
-  tray_view()->SetVisible(IsUserRotationLocked());
+  tray_view()->SetVisible(ShouldBeVisible());
+  UpdateTrayImage();
   Shell::Get()->screen_orientation_controller()->AddObserver(this);
 }
 
 void TrayRotationLock::OnMaximizeModeEnded() {
   tray_view()->SetVisible(false);
   StopObservingRotation();
 }
 
 void TrayRotationLock::DestroyTrayView() {
   StopObservingRotation();
   Shell::Get()->RemoveShellObserver(this);
   TrayImageItem::DestroyTrayView();
 }
 
 bool TrayRotationLock::GetInitialVisibility() {
   return ShouldBeVisible();
 }
 
+void TrayRotationLock::UpdateTrayImage() {
+  TrayImageItem::SetImageIcon(IsUserRotationLocked()
+                                  ? kSystemTrayRotationLockLockedIcon
+                                  : kSystemTrayRotationLockAutoIcon);
+}
+
 bool TrayRotationLock::ShouldBeVisible() {
-  return OnPrimaryDisplay() && IsMaximizeModeWindowManagerEnabled() &&
-         IsUserRotationLocked();
+  return OnPrimaryDisplay() && IsMaximizeModeWindowManagerEnabled();
 }
 
 bool TrayRotationLock::OnPrimaryDisplay() const {
   gfx::NativeView native_window = system_tray()->GetWidget()->GetNativeWindow();
   display::Display parent_display =
       display::Screen::GetScreen()->GetDisplayNearestWindow(native_window);
   return parent_display.IsInternal();
 }
 
 void TrayRotationLock::StopObservingRotation() {
   ScreenOrientationController* controller =
       Shell::Get()->screen_orientation_controller();
   if (controller)
     controller->RemoveObserver(this);
 }
 
 }  // namespace ash