Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Side by Side Diff: ash/display/display_manager_unittest.cc

Issue 2777163003: Remember User locked rotation (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ash/display/screen_orientation_controller_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/display/manager/display_manager.h" 5 #include "ui/display/manager/display_manager.h"
6 6
7 #include "ash/accelerators/accelerator_commands_aura.h" 7 #include "ash/accelerators/accelerator_commands_aura.h"
8 #include "ash/common/ash_switches.h" 8 #include "ash/common/ash_switches.h"
9 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
9 #include "ash/common/wm/window_state.h" 10 #include "ash/common/wm/window_state.h"
11 #include "ash/common/wm_shell.h"
12 #include "ash/common/wm_window.h"
10 #include "ash/display/display_configuration_controller.h" 13 #include "ash/display/display_configuration_controller.h"
11 #include "ash/display/display_util.h" 14 #include "ash/display/display_util.h"
12 #include "ash/display/mirror_window_controller.h" 15 #include "ash/display/mirror_window_controller.h"
16 #include "ash/display/screen_orientation_controller_chromeos.h"
13 #include "ash/display/window_tree_host_manager.h" 17 #include "ash/display/window_tree_host_manager.h"
14 #include "ash/screen_util.h" 18 #include "ash/screen_util.h"
19 #include "ash/shared/app_types.h"
15 #include "ash/shell.h" 20 #include "ash/shell.h"
16 #include "ash/strings/grit/ash_strings.h" 21 #include "ash/strings/grit/ash_strings.h"
17 #include "ash/test/ash_test_base.h" 22 #include "ash/test/ash_test_base.h"
18 #include "ash/test/mirror_window_test_api.h" 23 #include "ash/test/mirror_window_test_api.h"
19 #include "ash/wm/window_state_aura.h" 24 #include "ash/wm/window_state_aura.h"
25 #include "ash/wm/window_util.h"
20 #include "base/command_line.h" 26 #include "base/command_line.h"
21 #include "base/format_macros.h" 27 #include "base/format_macros.h"
22 #include "base/strings/string_number_conversions.h" 28 #include "base/strings/string_number_conversions.h"
23 #include "base/strings/stringprintf.h" 29 #include "base/strings/stringprintf.h"
24 #include "build/build_config.h" 30 #include "build/build_config.h"
31 #include "chromeos/accelerometer/accelerometer_reader.h"
32 #include "chromeos/accelerometer/accelerometer_types.h"
25 #include "ui/aura/client/aura_constants.h" 33 #include "ui/aura/client/aura_constants.h"
26 #include "ui/aura/env.h" 34 #include "ui/aura/env.h"
27 #include "ui/aura/window_observer.h" 35 #include "ui/aura/window_observer.h"
28 #include "ui/aura/window_tree_host.h" 36 #include "ui/aura/window_tree_host.h"
29 #include "ui/base/l10n/l10n_util.h" 37 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/display/display.h" 38 #include "ui/display/display.h"
31 #include "ui/display/display_layout_builder.h" 39 #include "ui/display/display_layout_builder.h"
32 #include "ui/display/display_observer.h" 40 #include "ui/display/display_observer.h"
33 #include "ui/display/display_switches.h" 41 #include "ui/display/display_switches.h"
34 #include "ui/display/manager/display_layout_store.h" 42 #include "ui/display/manager/display_layout_store.h"
(...skipping 2911 matching lines...) Expand 10 before | Expand all | Expand 10 after
2946 display::DisplayLayoutStore* layout_store = display_manager()->layout_store(); 2954 display::DisplayLayoutStore* layout_store = display_manager()->layout_store();
2947 display::DisplayIdList list = display::test::CreateDisplayIdList2(id1, id2); 2955 display::DisplayIdList list = display::test::CreateDisplayIdList2(id1, id2);
2948 layout_store->RegisterLayoutForDisplayIdList(list, std::move(old_layout)); 2956 layout_store->RegisterLayoutForDisplayIdList(list, std::move(old_layout));
2949 const display::DisplayLayout& stored = 2957 const display::DisplayLayout& stored =
2950 layout_store->GetRegisteredDisplayLayout(list); 2958 layout_store->GetRegisteredDisplayLayout(list);
2951 2959
2952 EXPECT_EQ(id1, stored.placement_list[0].parent_display_id); 2960 EXPECT_EQ(id1, stored.placement_list[0].parent_display_id);
2953 EXPECT_EQ(id2, stored.placement_list[0].display_id); 2961 EXPECT_EQ(id2, stored.placement_list[0].display_id);
2954 } 2962 }
2955 2963
2964 namespace {
2965
2966 class TestObserver : public ScreenOrientationController::Observer {
2967 public:
2968 TestObserver() {}
2969 ~TestObserver() override{};
2970
2971 void OnUserRotationLockChanged() override { count_++; }
2972
2973 int countAndReset() {
2974 int tmp = count_;
2975 count_ = 0;
2976 return tmp;
2977 }
2978
2979 private:
2980 int count_ = 0;
2981 };
2982
2983 } // namespace
2984
2985 TEST_F(DisplayManagerTest, SaveRestoreUserRotationLock) {
2986 Shell* shell = Shell::GetInstance();
2987 display::DisplayManager* display_manager = shell->display_manager();
2988 display::test::DisplayManagerTestApi test_api(display_manager);
2989 test_api.SetFirstDisplayAsInternalDisplay();
2990 ScreenOrientationController* orientation_controller =
2991 shell->screen_orientation_controller();
2992 TestObserver test_observer;
2993 orientation_controller->AddObserver(&test_observer);
2994
2995 // Set up windows with portrait,lanscape and any.
2996 aura::Window* window_a = CreateTestWindowInShellWithId(0);
2997 {
2998 WmWindow* wm_window_a = WmWindow::Get(window_a);
2999 wm_window_a->SetAppType(static_cast<int>(AppType::CHROME_APP));
3000 orientation_controller->LockOrientationForWindow(
3001 wm_window_a, blink::WebScreenOrientationLockAny);
3002 }
3003 aura::Window* window_p = CreateTestWindowInShellWithId(0);
3004 {
3005 WmWindow* wm_window_p = WmWindow::Get(window_p);
3006 wm_window_p->SetAppType(static_cast<int>(AppType::CHROME_APP));
3007 orientation_controller->LockOrientationForWindow(
3008 wm_window_p, blink::WebScreenOrientationLockPortrait);
3009 }
3010 aura::Window* window_l = CreateTestWindowInShellWithId(0);
3011 {
3012 WmWindow* wm_window_l = WmWindow::Get(window_l);
3013 wm_window_l->SetAppType(static_cast<int>(AppType::CHROME_APP));
3014 orientation_controller->LockOrientationForWindow(
3015 wm_window_l, blink::WebScreenOrientationLockLandscape);
3016 }
3017
3018 DisplayConfigurationController* configuration_controller =
3019 shell->display_configuration_controller();
3020 display::Screen* screen = display::Screen::GetScreen();
3021
3022 // Rotate to portrait in clamshell.
3023 configuration_controller->SetDisplayRotation(
3024 screen->GetPrimaryDisplay().id(), display::Display::ROTATE_90,
3025 display::Display::ROTATION_SOURCE_USER);
3026 EXPECT_EQ(display::Display::ROTATE_90,
3027 screen->GetPrimaryDisplay().rotation());
3028 EXPECT_FALSE(display_manager->registered_internal_display_rotation_lock());
3029
3030 EXPECT_EQ(0, test_observer.countAndReset());
3031 // Just enabling will not save the lock.
3032 WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
3033 true);
3034 EXPECT_EQ(1, test_observer.countAndReset());
3035
3036 EXPECT_EQ(display::Display::ROTATE_0, screen->GetPrimaryDisplay().rotation());
3037 EXPECT_FALSE(display_manager->registered_internal_display_rotation_lock());
3038
3039 // Enable lock at 0.
3040 orientation_controller->ToggleUserRotationLock();
3041 EXPECT_EQ(1, test_observer.countAndReset());
3042
3043 EXPECT_TRUE(display_manager->registered_internal_display_rotation_lock());
3044 EXPECT_EQ(display::Display::ROTATE_0,
3045 display_manager->registered_internal_display_rotation());
3046
3047 // Application can overwwrite the locked orientation.
3048 wm::ActivateWindow(window_p);
3049 EXPECT_EQ(display::Display::ROTATE_90,
3050 screen->GetPrimaryDisplay().rotation());
3051 EXPECT_EQ(display::Display::ROTATE_0,
3052 display_manager->registered_internal_display_rotation());
3053 EXPECT_EQ(0, test_observer.countAndReset());
3054
3055 // Any will rotate to the locked rotation.
3056 wm::ActivateWindow(window_a);
3057 EXPECT_EQ(display::Display::ROTATE_0, screen->GetPrimaryDisplay().rotation());
3058 EXPECT_TRUE(display_manager->registered_internal_display_rotation_lock());
3059 EXPECT_EQ(display::Display::ROTATE_0,
3060 display_manager->registered_internal_display_rotation());
3061 EXPECT_EQ(0, test_observer.countAndReset());
3062
3063 wm::ActivateWindow(window_l);
3064 EXPECT_EQ(display::Display::ROTATE_0, screen->GetPrimaryDisplay().rotation());
3065 EXPECT_TRUE(display_manager->registered_internal_display_rotation_lock());
3066 EXPECT_EQ(display::Display::ROTATE_0,
3067 display_manager->registered_internal_display_rotation());
3068 EXPECT_EQ(0, test_observer.countAndReset());
3069
3070 // Exit tablet mode reset to clamshell's rotation, which is 90.
3071 WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
3072 false);
3073 EXPECT_EQ(1, test_observer.countAndReset());
3074 EXPECT_EQ(display::Display::ROTATE_90,
3075 screen->GetPrimaryDisplay().rotation());
3076 // Activate Any.
3077 wm::ActivateWindow(window_a);
3078 WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
3079 true);
3080 EXPECT_EQ(1, test_observer.countAndReset());
3081 // Entering with active ANY will lock again to landscape.
3082 EXPECT_EQ(display::Display::ROTATE_0, screen->GetPrimaryDisplay().rotation());
3083
3084 wm::ActivateWindow(window_p);
3085 EXPECT_EQ(display::Display::ROTATE_90,
3086 screen->GetPrimaryDisplay().rotation());
3087 EXPECT_EQ(0, test_observer.countAndReset());
3088 orientation_controller->ToggleUserRotationLock();
3089 orientation_controller->ToggleUserRotationLock();
3090 EXPECT_EQ(2, test_observer.countAndReset());
3091
3092 EXPECT_TRUE(display_manager->registered_internal_display_rotation_lock());
3093 EXPECT_EQ(display::Display::ROTATE_90,
3094 display_manager->registered_internal_display_rotation());
3095
3096 wm::ActivateWindow(window_l);
3097 EXPECT_EQ(display::Display::ROTATE_0, screen->GetPrimaryDisplay().rotation());
3098 EXPECT_EQ(display::Display::ROTATE_90,
3099 display_manager->registered_internal_display_rotation());
3100
3101 // ANY will rotate to locked ortation.
3102 wm::ActivateWindow(window_a);
3103 EXPECT_EQ(display::Display::ROTATE_90,
3104 screen->GetPrimaryDisplay().rotation());
3105
3106 orientation_controller->RemoveObserver(&test_observer);
3107 }
3108
3109 TEST_F(DisplayManagerTest, UserRotationLockReverse) {
3110 Shell* shell = Shell::GetInstance();
3111 display::DisplayManager* display_manager = shell->display_manager();
3112 display::test::DisplayManagerTestApi test_api(display_manager);
3113 test_api.SetFirstDisplayAsInternalDisplay();
3114 ScreenOrientationController* orientation_controller =
3115 shell->screen_orientation_controller();
3116
3117 // Set up windows with portrait,lanscape and any.
3118 aura::Window* window = CreateTestWindowInShellWithId(0);
3119 WmWindow* wm_window = WmWindow::Get(window);
3120 wm_window->SetAppType(static_cast<int>(AppType::CHROME_APP));
3121 display::Screen* screen = display::Screen::GetScreen();
3122
3123 // Just enabling will not save the lock.
3124 WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
3125 true);
3126
3127 orientation_controller->LockOrientationForWindow(
3128 wm_window, blink::WebScreenOrientationLockPortrait);
3129 EXPECT_EQ(display::Display::ROTATE_90,
3130 screen->GetPrimaryDisplay().rotation());
3131
3132 const float kMeanGravity = -9.8066f;
3133
3134 scoped_refptr<chromeos::AccelerometerUpdate> reverse_portrait(
3135 new chromeos::AccelerometerUpdate());
3136 reverse_portrait->Set(chromeos::ACCELEROMETER_SOURCE_SCREEN, kMeanGravity,
3137 0.f, 0.f);
3138 orientation_controller->OnAccelerometerUpdated(reverse_portrait);
3139
3140 EXPECT_EQ(display::Display::ROTATE_270,
3141 screen->GetPrimaryDisplay().rotation());
3142
3143 scoped_refptr<chromeos::AccelerometerUpdate> portrait(
3144 new chromeos::AccelerometerUpdate());
3145 portrait->Set(chromeos::ACCELEROMETER_SOURCE_SCREEN, -kMeanGravity, 0.f, 0.f);
3146 orientation_controller->OnAccelerometerUpdated(portrait);
3147 EXPECT_EQ(display::Display::ROTATE_90,
3148 screen->GetPrimaryDisplay().rotation());
3149
3150 // Enable lock at 90.
3151 orientation_controller->ToggleUserRotationLock();
3152 EXPECT_TRUE(display_manager->registered_internal_display_rotation_lock());
3153 EXPECT_EQ(display::Display::ROTATE_90,
3154 display_manager->registered_internal_display_rotation());
3155
3156 orientation_controller->OnAccelerometerUpdated(reverse_portrait);
3157
3158 EXPECT_EQ(display::Display::ROTATE_90,
3159 screen->GetPrimaryDisplay().rotation());
3160 }
3161
2956 } // namespace ash 3162 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/display/screen_orientation_controller_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698