Merge "Revert "Cleanup flag "floating_menu_narrow_target...""" into main (bf98361e) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/DragToInteractAnimationControllerTest.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.platform.test.annotations.DisableFlags;
		import android.platform.test.annotations.EnableFlags;
		import android.testing.TestableLooper;
		import android.view.WindowManager;
		import android.view.accessibility.AccessibilityManager;

		import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.SmallTest;
		@@ -39,6 +40,7 @@ import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.junit.MockitoJUnit;
		import org.mockito.junit.MockitoRule;

		@@ -54,11 +56,15 @@ public class DragToInteractAnimationControllerTest extends SysuiTestCase {
		@Rule
		public MockitoRule mockito = MockitoJUnit.rule();

		@Mock
		private AccessibilityManager mAccessibilityManager;

		@Before
		public void setUp() throws Exception {
		final WindowManager stubWindowManager = mContext.getSystemService(WindowManager.class);
		final SecureSettings mockSecureSettings = TestUtils.mockSecureSettings();
		final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mockSecureSettings);
		final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mAccessibilityManager,
		mockSecureSettings);
		final MenuViewAppearance stubMenuViewAppearance = new MenuViewAppearance(mContext,
		stubWindowManager);
		final MenuView stubMenuView = spy(new MenuView(mContext, stubMenuViewModel,

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/MenuInfoRepositoryTest.java

+24 −2

Original line number	Diff line number	Diff line
		@@ -16,11 +16,16 @@

		package com.android.systemui.accessibility.floatingmenu;

		import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;

		import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.Mockito.any;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.verify;

		import android.content.Context;
		import android.content.res.Configuration;
		import android.view.accessibility.AccessibilityManager;

		import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.SmallTest;
		@@ -28,6 +33,7 @@ import androidx.test.filters.SmallTest;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.util.settings.SecureSettings;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;
		@@ -36,6 +42,8 @@ import org.mockito.Mock;
		import org.mockito.junit.MockitoJUnit;
		import org.mockito.junit.MockitoRule;

		import java.util.ArrayList;
		import java.util.List;
		import java.util.Locale;

		/** Tests for {@link MenuInfoRepository}. */
		@@ -45,17 +53,31 @@ public class MenuInfoRepositoryTest extends SysuiTestCase {
		@Rule
		public MockitoRule mockito = MockitoJUnit.rule();

		@Mock
		private AccessibilityManager mAccessibilityManager;

		@Mock
		private MenuInfoRepository.OnSettingsContentsChanged mMockSettingsContentsChanged;
		@Mock
		private SecureSettings mSecureSettings;

		private MenuInfoRepository mMenuInfoRepository;
		private final List<String> mShortcutTargets = new ArrayList<>();

		@Before
		public void setUp() {
		mMenuInfoRepository = new MenuInfoRepository(mContext, mMockSettingsContentsChanged,
		mSecureSettings);
		mContext.addMockSystemService(Context.ACCESSIBILITY_SERVICE, mAccessibilityManager);
		mShortcutTargets.add(MAGNIFICATION_CONTROLLER_NAME);
		doReturn(mShortcutTargets).when(mAccessibilityManager).getAccessibilityShortcutTargets(
		anyInt());

		mMenuInfoRepository = new MenuInfoRepository(mContext, mAccessibilityManager,
		mMockSettingsContentsChanged, mSecureSettings);
		}

		@After
		public void tearDown() {
		mShortcutTargets.clear();
		}

		@Test

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/MenuItemAccessibilityDelegateTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,8 @@ public class MenuItemAccessibilityDelegateTest extends SysuiTestCase {
		final WindowManager stubWindowManager = mContext.getSystemService(WindowManager.class);
		final MenuViewAppearance stubMenuViewAppearance = new MenuViewAppearance(mContext,
		stubWindowManager);
		final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mSecureSettings);
		final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mAccessibilityManager,
		mSecureSettings);

		final int halfScreenHeight =
		stubWindowManager.getCurrentWindowMetrics().getBounds().height() / 2;

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/MenuListViewTouchHandlerTest.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.platform.test.annotations.EnableFlags;
		import android.testing.TestableLooper;
		import android.view.MotionEvent;
		import android.view.WindowManager;
		import android.view.accessibility.AccessibilityManager;

		import androidx.dynamicanimation.animation.DynamicAnimation;
		import androidx.recyclerview.widget.RecyclerView;
		@@ -52,6 +53,7 @@ import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.junit.MockitoJUnit;
		import org.mockito.junit.MockitoRule;

		@@ -78,11 +80,15 @@ public class MenuListViewTouchHandlerTest extends SysuiTestCase {
		@Rule
		public MockitoRule mockito = MockitoJUnit.rule();

		@Mock
		private AccessibilityManager mAccessibilityManager;

		@Before
		public void setUp() throws Exception {
		final WindowManager windowManager = mContext.getSystemService(WindowManager.class);
		final SecureSettings secureSettings = TestUtils.mockSecureSettings();
		final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, secureSettings);
		final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mAccessibilityManager,
		secureSettings);
		final MenuViewAppearance stubMenuViewAppearance = new MenuViewAppearance(mContext,
		windowManager);
		mStubMenuView = new MenuView(mContext, stubMenuViewModel, stubMenuViewAppearance,

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/MenuViewTest.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.graphics.drawable.GradientDrawable;
		import android.platform.test.annotations.EnableFlags;
		import android.testing.TestableLooper;
		import android.view.WindowManager;
		import android.view.accessibility.AccessibilityManager;

		import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.SmallTest;
		@@ -48,6 +49,7 @@ import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.junit.MockitoJUnit;
		import org.mockito.junit.MockitoRule;

		@@ -66,6 +68,9 @@ public class MenuViewTest extends SysuiTestCase {
		@Rule
		public MockitoRule mockito = MockitoJUnit.rule();

		@Mock
		private AccessibilityManager mAccessibilityManager;

		private SysuiTestableContext mSpyContext;

		@Before
		@@ -84,7 +89,8 @@ public class MenuViewTest extends SysuiTestCase {
		doNothing().when(mSpyContext).startActivity(any());

		final SecureSettings secureSettings = TestUtils.mockSecureSettings();
		final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, secureSettings);
		final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mAccessibilityManager,
		secureSettings);
		final WindowManager stubWindowManager = mContext.getSystemService(WindowManager.class);
		mStubMenuViewAppearance = new MenuViewAppearance(mSpyContext, stubWindowManager);
		mMenuView = spy(new MenuView(mSpyContext, stubMenuViewModel, mStubMenuViewAppearance,