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

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

Issue 2773013003: 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_window.h"
10 #include "ash/display/display_configuration_controller.h" 12 #include "ash/display/display_configuration_controller.h"
11 #include "ash/display/display_util.h" 13 #include "ash/display/display_util.h"
12 #include "ash/display/mirror_window_controller.h" 14 #include "ash/display/mirror_window_controller.h"
15 #include "ash/display/screen_orientation_controller_chromeos.h"
13 #include "ash/display/window_tree_host_manager.h" 16 #include "ash/display/window_tree_host_manager.h"
14 #include "ash/screen_util.h" 17 #include "ash/screen_util.h"
18 #include "ash/shared/app_types.h"
15 #include "ash/shell.h" 19 #include "ash/shell.h"
16 #include "ash/strings/grit/ash_strings.h" 20 #include "ash/strings/grit/ash_strings.h"
17 #include "ash/test/ash_test_base.h" 21 #include "ash/test/ash_test_base.h"
18 #include "ash/test/mirror_window_test_api.h" 22 #include "ash/test/mirror_window_test_api.h"
19 #include "ash/wm/window_state_aura.h" 23 #include "ash/wm/window_state_aura.h"
24 #include "ash/wm/window_util.h"
20 #include "base/command_line.h" 25 #include "base/command_line.h"
21 #include "base/format_macros.h" 26 #include "base/format_macros.h"
22 #include "base/strings/string_number_conversions.h" 27 #include "base/strings/string_number_conversions.h"
23 #include "base/strings/stringprintf.h" 28 #include "base/strings/stringprintf.h"
24 #include "build/build_config.h" 29 #include "build/build_config.h"
30 #include "chromeos/accelerometer/accelerometer_reader.h"
31 #include "chromeos/accelerometer/accelerometer_types.h"
25 #include "ui/aura/client/aura_constants.h" 32 #include "ui/aura/client/aura_constants.h"
26 #include "ui/aura/env.h" 33 #include "ui/aura/env.h"
27 #include "ui/aura/window_observer.h" 34 #include "ui/aura/window_observer.h"
28 #include "ui/aura/window_tree_host.h" 35 #include "ui/aura/window_tree_host.h"
29 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/display/display.h" 37 #include "ui/display/display.h"
31 #include "ui/display/display_layout_builder.h" 38 #include "ui/display/display_layout_builder.h"
32 #include "ui/display/display_observer.h" 39 #include "ui/display/display_observer.h"
33 #include "ui/display/display_switches.h" 40 #include "ui/display/display_switches.h"
34 #include "ui/display/manager/display_layout_store.h" 41 #include "ui/display/manager/display_layout_store.h"
(...skipping 2885 matching lines...) Expand 10 before | Expand all | Expand 10 after
2920 display::DisplayLayoutStore* layout_store = display_manager()->layout_store(); 2927 display::DisplayLayoutStore* layout_store = display_manager()->layout_store();
2921 display::DisplayIdList list = display::test::CreateDisplayIdList2(id1, id2); 2928 display::DisplayIdList list = display::test::CreateDisplayIdList2(id1, id2);
2922 layout_store->RegisterLayoutForDisplayIdList(list, std::move(old_layout)); 2929 layout_store->RegisterLayoutForDisplayIdList(list, std::move(old_layout));
2923 const display::DisplayLayout& stored = 2930 const display::DisplayLayout& stored =
2924 layout_store->GetRegisteredDisplayLayout(list); 2931 layout_store->GetRegisteredDisplayLayout(list);
2925 2932
2926 EXPECT_EQ(id1, stored.placement_list[0].parent_display_id); 2933 EXPECT_EQ(id1, stored.placement_list[0].parent_display_id);
2927 EXPECT_EQ(id2, stored.placement_list[0].display_id); 2934 EXPECT_EQ(id2, stored.placement_list[0].display_id);
2928 } 2935 }
2929 2936
2937 namespace {
2938
2939 class TestObserver : public ScreenOrientationController::Observer {
2940 public:
2941 TestObserver() {}
2942 ~TestObserver() override{};
2943
2944 void OnUserRotationLockChanged() override { count_++; }
2945
2946 int countAndReset() {
2947 int tmp = count_;
2948 count_ = 0;
2949 return tmp;
2950 }
2951
2952 private:
2953 int count_ = 0;
2954 };
2955
2956 } // namespace
2957
2958 TEST_F(DisplayManagerTest, SaveRestoreUserRotationLock) {
2959 Shell* shell = Shell::Get();
2960 display::DisplayManager* display_manager = shell->display_manager();
2961 display::test::DisplayManagerTestApi test_api(display_manager);
2962 test_api.SetFirstDisplayAsInternalDisplay();
2963 ScreenOrientationController* orientation_controller =
2964 shell->screen_orientation_controller();
2965 TestObserver test_observer;
2966 orientation_controller->AddObserver(&test_observer);
2967
2968 // Set up windows with portrait,lanscape and any.
2969 aura::Window* window_a = CreateTestWindowInShellWithId(0);
2970 {
2971 WmWindow* wm_window_a = WmWindow::Get(window_a);
2972 wm_window_a->SetAppType(static_cast<int>(AppType::CHROME_APP));
2973 orientation_controller->LockOrientationForWindow(
2974 wm_window_a, blink::WebScreenOrientationLockAny);
2975 }
2976 aura::Window* window_p = CreateTestWindowInShellWithId(0);
2977 {
2978 WmWindow* wm_window_p = WmWindow::Get(window_p);
2979 wm_window_p->SetAppType(static_cast<int>(AppType::CHROME_APP));
2980 orientation_controller->LockOrientationForWindow(
2981 wm_window_p, blink::WebScreenOrientationLockPortrait);
2982 }
2983 aura::Window* window_l = CreateTestWindowInShellWithId(0);
2984 {
2985 WmWindow* wm_window_l = WmWindow::Get(window_l);
2986 wm_window_l->SetAppType(static_cast<int>(AppType::CHROME_APP));
2987 orientation_controller->LockOrientationForWindow(
2988 wm_window_l, blink::WebScreenOrientationLockLandscape);
2989 }
2990
2991 DisplayConfigurationController* configuration_controller =
2992 shell->display_configuration_controller();
2993 display::Screen* screen = display::Screen::GetScreen();
2994
2995 // Rotate to portrait in clamshell.
2996 configuration_controller->SetDisplayRotation(
2997 screen->GetPrimaryDisplay().id(), display::Display::ROTATE_90,
2998 display::Display::ROTATION_SOURCE_USER);
2999 EXPECT_EQ(display::Display::ROTATE_90,
3000 screen->GetPrimaryDisplay().rotation());
3001 EXPECT_FALSE(display_manager->registered_internal_display_rotation_lock());
3002
3003 EXPECT_EQ(0, test_observer.countAndReset());
3004 // Just enabling will not save the lock.
3005 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
3006 true);
3007 EXPECT_EQ(1, test_observer.countAndReset());
3008
3009 EXPECT_EQ(display::Display::ROTATE_0, screen->GetPrimaryDisplay().rotation());
3010 EXPECT_FALSE(display_manager->registered_internal_display_rotation_lock());
3011
3012 // Enable lock at 0.
3013 orientation_controller->ToggleUserRotationLock();
3014 EXPECT_EQ(1, test_observer.countAndReset());
3015
3016 EXPECT_TRUE(display_manager->registered_internal_display_rotation_lock());
3017 EXPECT_EQ(display::Display::ROTATE_0,
3018 display_manager->registered_internal_display_rotation());
3019
3020 // Application can overwwrite the locked orientation.
3021 wm::ActivateWindow(window_p);
3022 EXPECT_EQ(display::Display::ROTATE_90,
3023 screen->GetPrimaryDisplay().rotation());
3024 EXPECT_EQ(display::Display::ROTATE_0,
3025 display_manager->registered_internal_display_rotation());
3026 EXPECT_EQ(0, test_observer.countAndReset());
3027
3028 // Any will rotate to the locked rotation.
3029 wm::ActivateWindow(window_a);
3030 EXPECT_EQ(display::Display::ROTATE_0, screen->GetPrimaryDisplay().rotation());
3031 EXPECT_TRUE(display_manager->registered_internal_display_rotation_lock());
3032 EXPECT_EQ(display::Display::ROTATE_0,
3033 display_manager->registered_internal_display_rotation());
3034 EXPECT_EQ(0, test_observer.countAndReset());
3035
3036 wm::ActivateWindow(window_l);
3037 EXPECT_EQ(display::Display::ROTATE_0, screen->GetPrimaryDisplay().rotation());
3038 EXPECT_TRUE(display_manager->registered_internal_display_rotation_lock());
3039 EXPECT_EQ(display::Display::ROTATE_0,
3040 display_manager->registered_internal_display_rotation());
3041 EXPECT_EQ(0, test_observer.countAndReset());
3042
3043 // Exit tablet mode reset to clamshell's rotation, which is 90.
3044 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
3045 false);
3046 EXPECT_EQ(1, test_observer.countAndReset());
3047 EXPECT_EQ(display::Display::ROTATE_90,
3048 screen->GetPrimaryDisplay().rotation());
3049 // Activate Any.
3050 wm::ActivateWindow(window_a);
3051 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
3052 true);
3053 EXPECT_EQ(1, test_observer.countAndReset());
3054 // Entering with active ANY will lock again to landscape.
3055 EXPECT_EQ(display::Display::ROTATE_0, screen->GetPrimaryDisplay().rotation());
3056
3057 wm::ActivateWindow(window_p);
3058 EXPECT_EQ(display::Display::ROTATE_90,
3059 screen->GetPrimaryDisplay().rotation());
3060 EXPECT_EQ(0, test_observer.countAndReset());
3061 orientation_controller->ToggleUserRotationLock();
3062 orientation_controller->ToggleUserRotationLock();
3063 EXPECT_EQ(2, test_observer.countAndReset());
3064
3065 EXPECT_TRUE(display_manager->registered_internal_display_rotation_lock());
3066 EXPECT_EQ(display::Display::ROTATE_90,
3067 display_manager->registered_internal_display_rotation());
3068
3069 wm::ActivateWindow(window_l);
3070 EXPECT_EQ(display::Display::ROTATE_0, screen->GetPrimaryDisplay().rotation());
3071 EXPECT_EQ(display::Display::ROTATE_90,
3072 display_manager->registered_internal_display_rotation());
3073
3074 // ANY will rotate to locked ortation.
3075 wm::ActivateWindow(window_a);
3076 EXPECT_EQ(display::Display::ROTATE_90,
3077 screen->GetPrimaryDisplay().rotation());
3078
3079 orientation_controller->RemoveObserver(&test_observer);
3080 }
3081
3082 TEST_F(DisplayManagerTest, UserRotationLockReverse) {
3083 Shell* shell = Shell::Get();
3084 display::DisplayManager* display_manager = shell->display_manager();
3085 display::test::DisplayManagerTestApi test_api(display_manager);
3086 test_api.SetFirstDisplayAsInternalDisplay();
3087 ScreenOrientationController* orientation_controller =
3088 shell->screen_orientation_controller();
3089
3090 // Set up windows with portrait,lanscape and any.
3091 aura::Window* window = CreateTestWindowInShellWithId(0);
3092 WmWindow* wm_window = WmWindow::Get(window);
3093 wm_window->SetAppType(static_cast<int>(AppType::CHROME_APP));
3094 display::Screen* screen = display::Screen::GetScreen();
3095
3096 // Just enabling will not save the lock.
3097 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
3098 true);
3099
3100 orientation_controller->LockOrientationForWindow(
3101 wm_window, blink::WebScreenOrientationLockPortrait);
3102 EXPECT_EQ(display::Display::ROTATE_90,
3103 screen->GetPrimaryDisplay().rotation());
3104
3105 const float kMeanGravity = -9.8066f;
3106
3107 scoped_refptr<chromeos::AccelerometerUpdate> reverse_portrait(
3108 new chromeos::AccelerometerUpdate());
3109 reverse_portrait->Set(chromeos::ACCELEROMETER_SOURCE_SCREEN, kMeanGravity,
3110 0.f, 0.f);
3111 orientation_controller->OnAccelerometerUpdated(reverse_portrait);
3112
3113 EXPECT_EQ(display::Display::ROTATE_270,
3114 screen->GetPrimaryDisplay().rotation());
3115
3116 scoped_refptr<chromeos::AccelerometerUpdate> portrait(
3117 new chromeos::AccelerometerUpdate());
3118 portrait->Set(chromeos::ACCELEROMETER_SOURCE_SCREEN, -kMeanGravity, 0.f, 0.f);
3119 orientation_controller->OnAccelerometerUpdated(portrait);
3120 EXPECT_EQ(display::Display::ROTATE_90,
3121 screen->GetPrimaryDisplay().rotation());
3122
3123 // Enable lock at 90.
3124 orientation_controller->ToggleUserRotationLock();
3125 EXPECT_TRUE(display_manager->registered_internal_display_rotation_lock());
3126 EXPECT_EQ(display::Display::ROTATE_90,
3127 display_manager->registered_internal_display_rotation());
3128
3129 orientation_controller->OnAccelerometerUpdated(reverse_portrait);
3130
3131 EXPECT_EQ(display::Display::ROTATE_90,
3132 screen->GetPrimaryDisplay().rotation());
3133 }
3134
2930 } // namespace ash 3135 } // 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