Reland "[CrOS PhoneHub] Add enable hotspot and locate phone controller to quick actions UI."

This is a reland of 2e1031ec

Original change's description:
> [CrOS PhoneHub] Add enable hotspot and locate phone controller to quick
> actions UI.
>
> - Add enable hotspot and locate phone quick actions controllers.
> - Connect the controllers to quick actions UI.
> - Minor changes in fake tether controller for testing.
>
> BUG=1106937,1126208
>
> Change-Id: I1d4ace03120a4c51fcb351b7c19f33252b3fb81c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2428735
> Commit-Queue: Andre Le <leandre@chromium.org>
> Reviewed-by: Tim Song <tengs@chromium.org>
> Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#812915}

Bug: 1106937
Bug: 1126208
Change-Id: Ica4cafc1d2dac4d0c579fcbead6a7b771e35b87c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445835
Commit-Queue: Andre Le <leandre@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813287}

ash/BUILD.gn

@@ -1131,8 +1131,12 @@ component("ash") {
     "system/phonehub/connection_error_view.h",
     "system/phonehub/continue_browsing_chip.cc",
     "system/phonehub/continue_browsing_chip.h",
+    "system/phonehub/enable_hotspot_quick_action_controller.cc",
+    "system/phonehub/enable_hotspot_quick_action_controller.h",
     "system/phonehub/initial_connecting_view.cc",
     "system/phonehub/initial_connecting_view.h",
+    "system/phonehub/locate_phone_quick_action_controller.cc",
+    "system/phonehub/locate_phone_quick_action_controller.h",
     "system/phonehub/notification_opt_in_view.cc",
     "system/phonehub/notification_opt_in_view.h",
     "system/phonehub/onboarding_view.cc",

ash/system/phonehub/enable_hotspot_quick_action_controller.cc

+// Copyright 2020 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/phonehub/enable_hotspot_quick_action_controller.h"
+
+#include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/strings/grit/ash_strings.h"
+#include "ash/system/phonehub/quick_action_item.h"
+#include "ui/base/l10n/l10n_util.h"
+
+namespace ash {
+
+using Status = chromeos::phonehub::TetherController::Status;
+
+EnableHotspotQuickActionController::EnableHotspotQuickActionController(
+    chromeos::phonehub::TetherController* tether_controller)
+    : tether_controller_(tether_controller) {
+  DCHECK(tether_controller_);
+  tether_controller_->AddObserver(this);
+}
+
+EnableHotspotQuickActionController::~EnableHotspotQuickActionController() {
+  tether_controller_->RemoveObserver(this);
+}
+
+QuickActionItem* EnableHotspotQuickActionController::CreateItem() {
+  DCHECK(!item_);
+  item_ = new QuickActionItem(this, IDS_ASH_PHONE_HUB_ENABLE_HOTSPOT_TITLE,
+                              kSystemMenuPhoneIcon);
+  // When the UI has just opened, scan to see if there is a connection
+  // available.
+  if (tether_controller_->GetStatus() == Status::kConnectionUnavailable)
+    tether_controller_->ScanForAvailableConnection();
+  OnTetherStatusChanged();
+  return item_;
+}
+
+void EnableHotspotQuickActionController::OnButtonPressed(bool is_now_enabled) {
+  is_now_enabled ? tether_controller_->Disconnect()
+                 : tether_controller_->AttemptConnection();
+  // TODO(leandre): Add a timer to switch back to off state after connecting
+  // failed.
+}
+
+void EnableHotspotQuickActionController::OnTetherStatusChanged() {
+  switch (tether_controller_->GetStatus()) {
+    case Status::kIneligibleForFeature:
+      item_->SetVisible(false);
+      return;
+    case Status::kConnectionUnavailable:
+      SetState(ActionState::kNotAvailable);
+      break;
+    case Status::kConnectionAvailable:
+      SetState(ActionState::kNotConnected);
+      break;
+    case Status::kConnecting:
+      SetState(ActionState::kConnecting);
+      break;
+    case Status::kConnected:
+      SetState(ActionState::kConnected);
+      break;
+  }
+  item_->SetVisible(true);
+}
+
+void EnableHotspotQuickActionController::SetState(ActionState state) {
+  item_->SetEnabled(true);
+
+  bool icon_enabled;
+  int state_text_id;
+  int sub_label_text;
+  switch (state) {
+    case ActionState::kNotAvailable:
+      icon_enabled = false;
+      state_text_id =
+          IDS_ASH_PHONE_HUB_QUICK_ACTIONS_NOT_AVAILABLE_STATE_TOOLTIP;
+      sub_label_text = IDS_ASH_PHONE_HUB_QUICK_ACTIONS_NOT_AVAILABLE_STATE;
+      break;
+    case ActionState::kNotConnected:
+      icon_enabled = false;
+      state_text_id =
+          IDS_ASH_PHONE_HUB_QUICK_ACTIONS_NOT_CONNECTED_STATE_TOOLTIP;
+      sub_label_text = IDS_ASH_PHONE_HUB_QUICK_ACTIONS_NOT_CONNECTED_STATE;
+      break;
+    case ActionState::kConnecting:
+      icon_enabled = true;
+      state_text_id = IDS_ASH_PHONE_HUB_QUICK_ACTIONS_CONNECTING_STATE_TOOLTIP;
+      sub_label_text = IDS_ASH_PHONE_HUB_QUICK_ACTIONS_CONNECTING_STATE;
+      break;
+    case ActionState::kConnected:
+      icon_enabled = true;
+      state_text_id = IDS_ASH_PHONE_HUB_QUICK_ACTIONS_CONNECTED_STATE_TOOLTIP;
+      sub_label_text = IDS_ASH_PHONE_HUB_QUICK_ACTIONS_CONNECTED_STATE;
+      break;
+  }
+
+  item_->SetToggled(icon_enabled);
+  item_->SetSubLabel(l10n_util::GetStringUTF16(sub_label_text));
+  base::string16 tooltip_state =
+      l10n_util::GetStringFUTF16(state_text_id, item_->GetItemLabel());
+  item_->SetIconTooltip(
+      l10n_util::GetStringFUTF16(IDS_ASH_PHONE_HUB_QUICK_ACTIONS_TOGGLE_TOOLTIP,
+                                 item_->GetItemLabel(), tooltip_state));
+}
+
+}  // namespace ash

ash/system/phonehub/enable_hotspot_quick_action_controller.h

+// Copyright 2020 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.
+
+#ifndef ASH_SYSTEM_PHONEHUB_ENABLE_HOTSPOT_QUICK_ACTION_CONTROLLER_H_
+#define ASH_SYSTEM_PHONEHUB_ENABLE_HOTSPOT_QUICK_ACTION_CONTROLLER_H_
+
+#include "ash/system/phonehub/quick_action_controller_base.h"
+#include "chromeos/components/phonehub/tether_controller.h"
+
+namespace ash {
+
+// Controller of a quick action item that toggles Locate phone mode.
+class EnableHotspotQuickActionController
+    : public QuickActionControllerBase,
+      public chromeos::phonehub::TetherController::Observer {
+ public:
+  explicit EnableHotspotQuickActionController(
+      chromeos::phonehub::TetherController* tether_controller);
+  ~EnableHotspotQuickActionController() override;
+  EnableHotspotQuickActionController(EnableHotspotQuickActionController&) =
+      delete;
+  EnableHotspotQuickActionController operator=(
+      EnableHotspotQuickActionController&) = delete;
+
+  // QuickActionControllerBase:
+  QuickActionItem* CreateItem() override;
+  void OnButtonPressed(bool is_now_enabled) override;
+
+  // chromeos::phonehub::TetherController::Observer:
+  void OnTetherStatusChanged() override;
+
+ private:
+  // All the possible states that the enable hotspot button can be viewed. Each
+  // state has a corresponding icon, labels and tooltip view.
+  enum class ActionState {
+    kNotAvailable,
+    kNotConnected,
+    kConnecting,
+    kConnected
+  };
+
+  // Set the item (including icon, label and tooltips) to a certain state.
+  void SetState(ActionState state);
+
+  chromeos::phonehub::TetherController* tether_controller_ = nullptr;
+  QuickActionItem* item_ = nullptr;
+};
+
+}  // namespace ash
+
+#endif  // ASH_SYSTEM_PHONEHUB_ENABLE_HOTSPOT_QUICK_ACTION_CONTROLLER_H_

ash/system/phonehub/locate_phone_quick_action_controller.cc

+// Copyright 2020 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/phonehub/locate_phone_quick_action_controller.h"
+
+#include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/strings/grit/ash_strings.h"
+#include "ash/system/phonehub/quick_action_item.h"
+#include "ui/base/l10n/l10n_util.h"
+
+namespace ash {
+
+using Status = chromeos::phonehub::FindMyDeviceController::Status;
+
+LocatePhoneQuickActionController::LocatePhoneQuickActionController(
+    chromeos::phonehub::FindMyDeviceController* find_my_device_controller)
+    : find_my_device_controller_(find_my_device_controller) {
+  DCHECK(find_my_device_controller_);
+  find_my_device_controller_->AddObserver(this);
+}
+
+LocatePhoneQuickActionController::~LocatePhoneQuickActionController() {
+  find_my_device_controller_->RemoveObserver(this);
+}
+
+QuickActionItem* LocatePhoneQuickActionController::CreateItem() {
+  DCHECK(!item_);
+  item_ = new QuickActionItem(this, IDS_ASH_PHONE_HUB_LOCATE_PHONE_TITLE,
+                              kSystemMenuPhoneIcon);
+  OnPhoneRingingStateChanged();
+  return item_;
+}
+
+void LocatePhoneQuickActionController::OnButtonPressed(bool is_now_enabled) {
+  SetState(ActionState::kConnecting);
+  find_my_device_controller_->RequestNewPhoneRingingState(!is_now_enabled);
+}
+
+void LocatePhoneQuickActionController::OnPhoneRingingStateChanged() {
+  switch (find_my_device_controller_->GetPhoneRingingStatus()) {
+    case Status::kRingingOff:
+      SetState(ActionState::kOff);
+      break;
+    case Status::kRingingOn:
+      SetState(ActionState::kOn);
+      break;
+    case Status::kRingingNotAvailable:
+      item_->SetEnabled(false);
+      return;
+  }
+  item_->SetEnabled(true);
+}
+
+void LocatePhoneQuickActionController::SetState(ActionState state) {
+  bool icon_enabled;
+  int state_text_id;
+  int sub_label_text;
+  switch (state) {
+    case ActionState::kOff:
+      icon_enabled = false;
+      state_text_id = IDS_ASH_PHONE_HUB_QUICK_ACTIONS_DISABLED_STATE_TOOLTIP;
+      sub_label_text = IDS_ASH_PHONE_HUB_QUICK_ACTIONS_OFF_STATE;
+      break;
+    case ActionState::kConnecting:
+      icon_enabled = true;
+      state_text_id = IDS_ASH_PHONE_HUB_QUICK_ACTIONS_CONNECTING_STATE_TOOLTIP;
+      sub_label_text = IDS_ASH_PHONE_HUB_QUICK_ACTIONS_CONNECTING_STATE;
+      break;
+    case ActionState::kOn:
+      icon_enabled = true;
+      state_text_id = IDS_ASH_PHONE_HUB_QUICK_ACTIONS_ENABLED_STATE_TOOLTIP;
+      sub_label_text = IDS_ASH_PHONE_HUB_QUICK_ACTIONS_ON_STATE;
+      break;
+  }
+
+  item_->SetToggled(icon_enabled);
+  item_->SetSubLabel(l10n_util::GetStringUTF16(sub_label_text));
+  base::string16 tooltip_state =
+      l10n_util::GetStringFUTF16(state_text_id, item_->GetItemLabel());
+  item_->SetIconTooltip(
+      l10n_util::GetStringFUTF16(IDS_ASH_PHONE_HUB_QUICK_ACTIONS_TOGGLE_TOOLTIP,
+                                 item_->GetItemLabel(), tooltip_state));
+}
+
+}  // namespace ash

ash/system/phonehub/locate_phone_quick_action_controller.h

+// Copyright 2020 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.
+
+#ifndef ASH_SYSTEM_PHONEHUB_LOCATE_PHONE_QUICK_ACTION_CONTROLLER_H_
+#define ASH_SYSTEM_PHONEHUB_LOCATE_PHONE_QUICK_ACTION_CONTROLLER_H_
+
+#include "ash/system/phonehub/quick_action_controller_base.h"
+#include "chromeos/components/phonehub/find_my_device_controller.h"
+
+namespace ash {
+
+// Controller of a quick action item that toggles Locate phone mode.
+class LocatePhoneQuickActionController
+    : public QuickActionControllerBase,
+      public chromeos::phonehub::FindMyDeviceController::Observer {
+ public:
+  explicit LocatePhoneQuickActionController(
+      chromeos::phonehub::FindMyDeviceController* find_my_device_controller);
+  ~LocatePhoneQuickActionController() override;
+  LocatePhoneQuickActionController(LocatePhoneQuickActionController&) = delete;
+  LocatePhoneQuickActionController operator=(
+      LocatePhoneQuickActionController&) = delete;
+
+  // QuickActionControllerBase:
+  QuickActionItem* CreateItem() override;
+  void OnButtonPressed(bool is_now_enabled) override;
+
+  // chromeos::phonehub::FindMyDeviceController::Observer:
+  void OnPhoneRingingStateChanged() override;
+
+ private:
+  // All the possible states that the locate phone button can be viewed. Each
+  // state has a corresponding icon, labels and tooltip view.
+  enum class ActionState { kOff, kConnecting, kOn };
+
+  // Set the item (including icon, label and tooltips) to a certain state.
+  void SetState(ActionState state);
+
+  chromeos::phonehub::FindMyDeviceController* find_my_device_controller_ =
+      nullptr;
+  QuickActionItem* item_ = nullptr;
+};
+
+}  // namespace ash
+
+#endif  // ASH_SYSTEM_PHONEHUB_LOCATE_PHONE_QUICK_ACTION_CONTROLLER_H_

ash/system/phonehub/quick_action_item.cc

@@ -58,10 +58,9 @@ QuickActionItem::QuickActionItem(Delegate* delegate,
 
   label_ = label_view->AddChildView(
       std::make_unique<views::Label>(l10n_util::GetStringUTF16(label_id)));
-  ConfigureLabel(label_, true /* is_primary */);
-
   sub_label_ = label_view->AddChildView(std::make_unique<views::Label>());
-  ConfigureLabel(sub_label_, false /* is_primary */);
+
+  SetEnabled(true /* enabled */);
 
   SetPaintToLayer();
   layer()->SetFillsBoundsOpaquely(false);
@@ -78,13 +77,17 @@ void QuickActionItem::SetSubLabel(const base::string16& sub_label) {
   sub_label_->SetText(sub_label);
 }
 
+void QuickActionItem::SetIcon(bool is_on) {
+  icon_button_->SetVectorIcon(is_on ? icon_on_ : icon_off_);
+}
+
 void QuickActionItem::SetIconTooltip(const base::string16& text) {
   icon_button_->SetTooltipText(text);
 }
 
 void QuickActionItem::SetToggled(bool toggled) {
   icon_button_->SetToggled(toggled);
-  icon_button_->SetVectorIcon(toggled ? icon_on_ : icon_off_);
+  SetIcon(toggled /* is_on */);
 }
 
 bool QuickActionItem::IsToggled() const {
@@ -110,6 +113,7 @@ void QuickActionItem::SetEnabled(bool enabled) {
     icon_button_->SetTooltipText(l10n_util::GetStringFUTF16(
         IDS_ASH_PHONE_HUB_QUICK_ACTIONS_NOT_AVAILABLE_STATE_TOOLTIP,
         GetItemLabel()));
+    SetIcon(false /* is_on */);
   } else {
     ConfigureLabel(label_, true /* is_primary */);
     ConfigureLabel(sub_label_, false /* is_primary */);

ash/system/phonehub/quick_action_item.h

@@ -43,6 +43,9 @@ class QuickActionItem : public views::View, public views::ButtonListener {
   // Set the text of sub-label shown below the label.
   void SetSubLabel(const base::string16& sub_label);
 
+  // Set the icon button to be either |icon_on_| or |icon_off_|.
+  void SetIcon(bool is_on);
+
   // Set the tooltip text of the icon button.
   void SetIconTooltip(const base::string16& text);
 

ash/system/phonehub/quick_actions_view.cc

@@ -4,6 +4,8 @@
 
 #include "ash/system/phonehub/quick_actions_view.h"
 
+#include "ash/system/phonehub/enable_hotspot_quick_action_controller.h"
+#include "ash/system/phonehub/locate_phone_quick_action_controller.h"
 #include "ash/system/phonehub/phone_hub_view_ids.h"
 #include "ash/system/phonehub/quick_action_item.h"
 #include "ash/system/phonehub/silence_phone_quick_action_controller.h"
@@ -36,8 +38,13 @@ QuickActionsView::QuickActionsView(
 QuickActionsView::~QuickActionsView() = default;
 
 void QuickActionsView::InitQuickActionItems() {
+  enable_hotspot_ =
+      AddItem(std::make_unique<EnableHotspotQuickActionController>(
+          phone_hub_manager_->GetTetherController()));
   silence_phone_ = AddItem(std::make_unique<SilencePhoneQuickActionController>(
       phone_hub_manager_->GetDoNotDisturbController()));
+  locate_phone_ = AddItem(std::make_unique<LocatePhoneQuickActionController>(
+      phone_hub_manager_->GetFindMyDeviceController()));
 }
 
 QuickActionItem* QuickActionsView::AddItem(

ash/system/phonehub/quick_actions_view.h

@@ -24,9 +24,11 @@ class ASH_EXPORT QuickActionsView : public views::View {
   QuickActionsView(QuickActionsView&) = delete;
   QuickActionsView operator=(QuickActionsView&) = delete;
 
- private:
-  FRIEND_TEST_ALL_PREFIXES(QuickActionsViewTest, QuickActionsToggle);
+  QuickActionItem* enable_hotspot_for_testing() { return enable_hotspot_; }
+  QuickActionItem* silence_phone_for_testing() { return silence_phone_; }
+  QuickActionItem* locate_phone_for_testing() { return locate_phone_; }
 
+ private:
   // Add all the quick actions items to the view.
   void InitQuickActionItems();
 
@@ -41,7 +43,9 @@ class ASH_EXPORT QuickActionsView : public views::View {
   chromeos::phonehub::PhoneHubManager* phone_hub_manager_ = nullptr;
 
   // QuickActionItem for unit testing. Owned by this view.
+  QuickActionItem* enable_hotspot_ = nullptr;
   QuickActionItem* silence_phone_ = nullptr;
+  QuickActionItem* locate_phone_ = nullptr;
 };
 
 }  // namespace ash

ash/system/phonehub/quick_actions_view_unittest.cc

@@ -12,7 +12,8 @@
 
 namespace ash {
 
-using Status = chromeos::phonehub::TetherController::Status;
+using TetherController = chromeos::phonehub::TetherController;
+using FindMyDeviceController = chromeos::phonehub::FindMyDeviceController;
 
 namespace {
 
@@ -60,17 +61,68 @@ class QuickActionsViewTest : public AshTestBase {
   base::test::ScopedFeatureList feature_list_;
 };
 
-TEST_F(QuickActionsViewTest, QuickActionsToggle) {
+TEST_F(QuickActionsViewTest, EnableHotspotVisibility) {
+  tether_controller()->SetStatus(
+      TetherController::Status::kIneligibleForFeature);
+
+  // Enable Hotspot button should not be shown if the feature is ineligible.
+  EXPECT_FALSE(actions_view()->enable_hotspot_for_testing()->GetVisible());
+
+  tether_controller()->SetStatus(
+      TetherController::Status::kConnectionAvailable);
+  // Enable Hotspot button should be shown if the feature is available.
+  EXPECT_TRUE(actions_view()->enable_hotspot_for_testing()->GetVisible());
+}
+
+TEST_F(QuickActionsViewTest, EnableHotspotToggle) {
+  tether_controller()->SetStatus(
+      TetherController::Status::kConnectionAvailable);
+
+  // Simulate a toggle press. Status should be connecting.
+  actions_view()->enable_hotspot_for_testing()->ButtonPressed(nullptr,
+                                                              DummyEvent());
+  EXPECT_EQ(TetherController::Status::kConnecting,
+            tether_controller()->GetStatus());
+
+  tether_controller()->SetStatus(TetherController::Status::kConnected);
+  // Toggle again will change the state.
+  actions_view()->enable_hotspot_for_testing()->ButtonPressed(nullptr,
+                                                              DummyEvent());
+  EXPECT_EQ(TetherController::Status::kConnecting,
+            tether_controller()->GetStatus());
+}
+
+TEST_F(QuickActionsViewTest, SilencePhoneToggle) {
   // Initially, silence phone is not enabled.
   EXPECT_FALSE(dnd_controller()->IsDndEnabled());
 
   // Toggle the button will enable the feature.
-  actions_view()->silence_phone_->ButtonPressed(nullptr, DummyEvent());
+  actions_view()->silence_phone_for_testing()->ButtonPressed(nullptr,
+                                                             DummyEvent());
   EXPECT_TRUE(dnd_controller()->IsDndEnabled());
 
   // Togge again to disable.
-  actions_view()->silence_phone_->ButtonPressed(nullptr, DummyEvent());
+  actions_view()->silence_phone_for_testing()->ButtonPressed(nullptr,
+                                                             DummyEvent());
   EXPECT_FALSE(dnd_controller()->IsDndEnabled());
 }
 
+TEST_F(QuickActionsViewTest, LocatePhoneToggle) {
+  // Initially, locate phone is not enabled.
+  EXPECT_EQ(FindMyDeviceController::Status::kRingingOff,
+            find_my_device_controller()->GetPhoneRingingStatus());
+
+  // Toggle the button will enable the feature.
+  actions_view()->locate_phone_for_testing()->ButtonPressed(nullptr,
+                                                            DummyEvent());
+  EXPECT_EQ(FindMyDeviceController::Status::kRingingOn,
+            find_my_device_controller()->GetPhoneRingingStatus());
+
+  // Togge again to disable.
+  actions_view()->locate_phone_for_testing()->ButtonPressed(nullptr,
+                                                            DummyEvent());
+  EXPECT_EQ(FindMyDeviceController::Status::kRingingOff,
+            find_my_device_controller()->GetPhoneRingingStatus());
+}
+
 }  // namespace ash

chromeos/components/phonehub/fake_tether_controller.cc

@@ -7,7 +7,8 @@
 namespace chromeos {
 namespace phonehub {
 
-FakeTetherController::FakeTetherController() = default;
+FakeTetherController::FakeTetherController()
+    : status_(Status::kConnectionAvailable) {}
 
 FakeTetherController::~FakeTetherController() = default;
 

chromeos/components/phonehub/fake_tether_controller.h

@@ -21,6 +21,7 @@ class FakeTetherController : public TetherController {
   Status GetStatus() const override;
 
  private:
+  // TetherController:
   void ScanForAvailableConnection() override;
   void AttemptConnection() override;
   void Disconnect() override;