Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd281f6b authored by Cam Bickel's avatar Cam Bickel Committed by Camden Bickel
Browse files

Cleanup flag "floating_menu_narrow_target..." 

Full flag name:
"floating_menu_narrow_target_content_observer"

This CL is more involved than other flag cleanup CLs, because removing
the flag in MenuInfoRepository.java removed the need for
AccessibilityManager in that constructor. Removing AccessibilityManager
from the constructor had a cascading effect on other related classes
and tests.

Bug: b/331740049
Test: atest DragToInteractAnimationControllerTest MenuInfoRepositoryTest MenuItemAccessibilityDelegateTest MenuListViewTouchHandlerTest MenuViewTest MenuAnimationControllerTest MenuViewLayerTest
Flag: EXEMPT flag cleanup
Change-Id: I94de6e205aef9bc8bd35798052740c6da929c446
parent 6493c50c

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

+1 −7
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 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;
@@ -40,7 +39,6 @@ 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;
@@ -56,15 +54,11 @@ 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, mAccessibilityManager,

                mockSecureSettings);

        final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, 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

+2 −24
Original line number Diff line number Diff line
@@ -16,16 +16,11 @@ 


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;
@@ -33,7 +28,6 @@ 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;
@@ -42,8 +36,6 @@ 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}. */
@@ -53,31 +45,17 @@ 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() {

        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();

        mMenuInfoRepository = new MenuInfoRepository(mContext, mMockSettingsContentsChanged,

                mSecureSettings);

    }



    @Test

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

+1 −2
Original line number Diff line number Diff line
@@ -83,8 +83,7 @@ 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, mAccessibilityManager,

                mSecureSettings);

        final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mSecureSettings);



        final int halfScreenHeight =

                stubWindowManager.getCurrentWindowMetrics().getBounds().height() / 2;

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

+1 −7
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 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;
@@ -53,7 +52,6 @@ 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;
@@ -80,15 +78,11 @@ 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, mAccessibilityManager,

                secureSettings);

        final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, 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

+1 −7
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 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;
@@ -49,7 +48,6 @@ 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;
@@ -68,9 +66,6 @@ public class MenuViewTest extends SysuiTestCase { 
    @Rule

    public MockitoRule mockito = MockitoJUnit.rule();



    @Mock

    private AccessibilityManager mAccessibilityManager;



    private SysuiTestableContext mSpyContext;



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



        final SecureSettings secureSettings = TestUtils.mockSecureSettings();

        final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mAccessibilityManager,

                secureSettings);

        final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, secureSettings);

        final WindowManager stubWindowManager = mContext.getSystemService(WindowManager.class);

        mStubMenuViewAppearance = new MenuViewAppearance(mSpyContext, stubWindowManager);

        mMenuView = spy(new MenuView(mSpyContext, stubMenuViewModel, mStubMenuViewAppearance,