Merge "Test should handle both device orientations" into sc-v2-dev am: 2f48e69754

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15517448

Change-Id: I9c794299004d777ee0670af35f33e685e44f59df
This commit is contained in:
TreeHugger Robot
2021-08-11 15:28:57 +00:00
committed by Automerger Merge Worker

View File

@@ -16,6 +16,7 @@
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_NEVER;
import static android.view.WindowInsets.Type.ime;
@@ -134,7 +135,10 @@ public class AccessibilityFloatingMenuViewTest extends SysuiTestCase {
mMenuHalfHeight = menuHeight / 2;
mScreenHalfWidth = screenWidth / 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;
mMaxWindowY = mScreenHeight - mMenuWindowHeight;
}