Commit fd33ca87 authored by Daniel Erat's avatar Daniel Erat Committed by Commit Bot

chromeos: Enable mode-specific power button behavior.

Enable mode-specific power button behavior by default. In
short, tapping the power button turns the display off on
devices that are in tablet mode but is ignored on devices
that are in laptop mode.

Bug: 819276, 783164
Change-Id: Ic658e034366a32066940c647a73b8c61ecec2840
Reviewed-on: https://chromium-review.googlesource.com/1014486
Commit-Queue: Dan Erat <derat@chromium.org>
Reviewed-by: default avatarMin Chen <minch@chromium.org>
Reviewed-by: default avatarQiang Xu <warx@google.com>
Cr-Commit-Position: refs/heads/master@{#551427}
parent 8cbea5ec
...@@ -1012,6 +1012,7 @@ TEST_F(PreferredReservedAcceleratorsTest, AcceleratorsWithFullscreen) { ...@@ -1012,6 +1012,7 @@ TEST_F(PreferredReservedAcceleratorsTest, AcceleratorsWithFullscreen) {
ui::test::EventGenerator& generator = GetEventGenerator(); ui::test::EventGenerator& generator = GetEventGenerator();
// Power key (reserved) should always be handled. // Power key (reserved) should always be handled.
Shell::Get()->power_button_controller()->OnTabletModeStarted();
PowerButtonControllerTestApi test_api( PowerButtonControllerTestApi test_api(
Shell::Get()->power_button_controller()); Shell::Get()->power_button_controller());
EXPECT_FALSE(test_api.PowerButtonMenuTimerIsRunning()); EXPECT_FALSE(test_api.PowerButtonMenuTimerIsRunning());
...@@ -1061,6 +1062,7 @@ TEST_F(PreferredReservedAcceleratorsTest, AcceleratorsWithPinned) { ...@@ -1061,6 +1062,7 @@ TEST_F(PreferredReservedAcceleratorsTest, AcceleratorsWithPinned) {
ui::test::EventGenerator& generator = GetEventGenerator(); ui::test::EventGenerator& generator = GetEventGenerator();
// Power key (reserved) should always be handled. // Power key (reserved) should always be handled.
Shell::Get()->power_button_controller()->OnTabletModeStarted();
PowerButtonControllerTestApi test_api( PowerButtonControllerTestApi test_api(
Shell::Get()->power_button_controller()); Shell::Get()->power_button_controller());
EXPECT_FALSE(test_api.PowerButtonMenuTimerIsRunning()); EXPECT_FALSE(test_api.PowerButtonMenuTimerIsRunning());
......
...@@ -196,6 +196,7 @@ class LockScreenNoteDisplayStateHandlerTest : public AshTestBase { ...@@ -196,6 +196,7 @@ class LockScreenNoteDisplayStateHandlerTest : public AshTestBase {
chromeos::PowerManagerClient::SwitchStates{ chromeos::PowerManagerClient::SwitchStates{
chromeos::PowerManagerClient::LidState::OPEN, chromeos::PowerManagerClient::LidState::OPEN,
chromeos::PowerManagerClient::TabletMode::ON}); chromeos::PowerManagerClient::TabletMode::ON});
Shell::Get()->power_button_controller()->OnTabletModeStarted();
} }
base::SimpleTestTickClock tick_clock_; base::SimpleTestTickClock tick_clock_;
......
...@@ -35,7 +35,7 @@ const base::Feature kLockScreenNotifications{"LockScreenNotifications", ...@@ -35,7 +35,7 @@ const base::Feature kLockScreenNotifications{"LockScreenNotifications",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kModeSpecificPowerButton{"ModeSpecificPowerButton", const base::Feature kModeSpecificPowerButton{"ModeSpecificPowerButton",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
bool IsDisplayMoveWindowAccelsEnabled() { bool IsDisplayMoveWindowAccelsEnabled() {
return base::FeatureList::IsEnabled(kDisplayMoveWindowAccels); return base::FeatureList::IsEnabled(kDisplayMoveWindowAccels);
......
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