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

Commit be8dedce authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "SysuiTestCase mocks gantry FeatureFlags" into main

parents 167f08cf 91a53963

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ android_library { 
        "SystemUI-statsd",

        "SettingsLib",

        "com_android_systemui_flags_lib",

        "flag-junit-base",

        "androidx.viewpager2_viewpager2",

        "androidx.legacy_legacy-support-v4",

        "androidx.recyclerview_recyclerview",

packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuControllerTest.java

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ package com.android.systemui.accessibility.floatingmenu; 
import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;

import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;



import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG;

import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;
@@ -87,6 +90,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { 


    @Before

    public void setUp() throws Exception {

        setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG);

        MockitoAnnotations.initMocks(this);

        mContextWrapper = new ContextWrapper(mContext) {

            @Override

packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/DismissAnimationControllerTest.java

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.systemui.accessibility.floatingmenu;



import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG;

import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault;



import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;
@@ -56,6 +59,7 @@ public class DismissAnimationControllerTest extends SysuiTestCase { 


    @Before

    public void setUp() throws Exception {

        setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG);

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

        final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mAccessibilityManager,

                mock(SecureSettings.class));

packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.systemui.accessibility.floatingmenu;



import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG;

import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.any;
@@ -75,6 +78,7 @@ public class MenuAnimationControllerTest extends SysuiTestCase { 


    @Before

    public void setUp() throws Exception {

        setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG);

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

        final MenuViewAppearance stubMenuViewAppearance = new MenuViewAppearance(mContext,

                stubWindowManager);
@@ -96,6 +100,7 @@ public class MenuAnimationControllerTest extends SysuiTestCase { 
        Prefs.putBoolean(mContext, Prefs.Key.HAS_ACCESSIBILITY_FLOATING_MENU_TUCKED,

                mLastIsMoveToTucked);

        mEndListenerCaptor.getAllValues().clear();

        mMenuAnimationController.mPositionAnimations.values().forEach(DynamicAnimation::cancel);

    }



    @Test

packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuEduTooltipViewTest.java

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.systemui.accessibility.floatingmenu;



import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG;

import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault;



import static com.google.common.truth.Truth.assertThat;



import android.content.res.Resources;
@@ -43,6 +46,7 @@ public class MenuEduTooltipViewTest extends SysuiTestCase { 


    @Before

    public void setUp() throws Exception {

        setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG);

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

        mMenuViewAppearance = new MenuViewAppearance(mContext, windowManager);

        mMenuEduTooltipView = new MenuEduTooltipView(mContext, mMenuViewAppearance);