Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Test should handle both device orientations" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-11 15:15:42 +00:00
committed by Android (Google) Code Review
parent 5214873aa8 bc2f0869e0
commit 2f48e69754
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuViewTest.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.accessibility.floatingmenu; package com.android.systemui.accessibility.floatingmenu;
import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
import static android.view.View.OVER_SCROLL_ALWAYS; import static android.view.View.OVER_SCROLL_ALWAYS;
import static android.view.View.OVER_SCROLL_NEVER; import static android.view.View.OVER_SCROLL_NEVER;
import static android.view.WindowInsets.Type.ime; import static android.view.WindowInsets.Type.ime;
@@ -134,7 +135,10 @@ public class AccessibilityFloatingMenuViewTest extends SysuiTestCase {
mMenuHalfHeight = menuHeight / 2; mMenuHalfHeight = menuHeight / 2;
mScreenHalfWidth = screenWidth / 2; mScreenHalfWidth = screenWidth / 2;
mScreenHalfHeight = mScreenHeight / 2; mScreenHalfHeight = mScreenHeight / 2;
mMaxWindowX = screenWidth - margin - menuWidth; int marginStartEnd =
mContext.getResources().getConfiguration().orientation == ORIENTATION_PORTRAIT
? margin : 0;
mMaxWindowX = screenWidth - marginStartEnd - menuWidth;
mMenuWindowHeight = menuHeight + margin * 2; mMenuWindowHeight = menuHeight + margin * 2;
mMaxWindowY = mScreenHeight - mMenuWindowHeight; mMaxWindowY = mScreenHeight - mMenuWindowHeight;
} }