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

Commit 7e2310ec authored by Riley Jones's avatar Riley Jones
Browse files

Util file for easily setting up SysUi fake flags

Test: atest com.android.systemui.accessibility.floatingmenu
Change-Id: I422e7b3a96dbe2cf6c0fb03bd918e8bcac3a1bf5
parent 634d4325
Loading
Loading
Loading
Loading
+2 −3
Original line number Original line Diff line number Diff line
@@ -19,8 +19,7 @@ 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_FLOATING_MENU;
import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;
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.accessibility.utils.FlagUtils.setFlagDefaults;
import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault;


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


@@ -90,7 +89,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase {


    @Before
    @Before
    public void setUp() throws Exception {
    public void setUp() throws Exception {
        setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG);
        setFlagDefaults(mSetFlagsRule);
        MockitoAnnotations.initMocks(this);
        MockitoAnnotations.initMocks(this);
        mContextWrapper = new ContextWrapper(mContext) {
        mContextWrapper = new ContextWrapper(mContext) {
            @Override
            @Override
+2 −3
Original line number Original line Diff line number Diff line
@@ -16,8 +16,7 @@


package com.android.systemui.accessibility.floatingmenu;
package com.android.systemui.accessibility.floatingmenu;


import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG;
import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults;
import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault;


import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.spy;
@@ -59,7 +58,7 @@ public class DismissAnimationControllerTest extends SysuiTestCase {


    @Before
    @Before
    public void setUp() throws Exception {
    public void setUp() throws Exception {
        setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG);
        setFlagDefaults(mSetFlagsRule);
        final WindowManager stubWindowManager = mContext.getSystemService(WindowManager.class);
        final WindowManager stubWindowManager = mContext.getSystemService(WindowManager.class);
        final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mAccessibilityManager,
        final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mAccessibilityManager,
                mock(SecureSettings.class));
                mock(SecureSettings.class));
+2 −3
Original line number Original line Diff line number Diff line
@@ -16,8 +16,7 @@


package com.android.systemui.accessibility.floatingmenu;
package com.android.systemui.accessibility.floatingmenu;


import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG;
import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults;
import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault;


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


@@ -78,7 +77,7 @@ public class MenuAnimationControllerTest extends SysuiTestCase {


    @Before
    @Before
    public void setUp() throws Exception {
    public void setUp() throws Exception {
        setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG);
        setFlagDefaults(mSetFlagsRule);
        final WindowManager stubWindowManager = mContext.getSystemService(WindowManager.class);
        final WindowManager stubWindowManager = mContext.getSystemService(WindowManager.class);
        final MenuViewAppearance stubMenuViewAppearance = new MenuViewAppearance(mContext,
        final MenuViewAppearance stubMenuViewAppearance = new MenuViewAppearance(mContext,
                stubWindowManager);
                stubWindowManager);
+3 −4
Original line number Original line Diff line number Diff line
@@ -16,8 +16,7 @@


package com.android.systemui.accessibility.floatingmenu;
package com.android.systemui.accessibility.floatingmenu;


import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG;
import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults;
import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault;


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


@@ -29,8 +28,8 @@ import android.widget.TextView;


import androidx.test.filters.SmallTest;
import androidx.test.filters.SmallTest;


import com.android.systemui.res.R;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.res.R;


import org.junit.Before;
import org.junit.Before;
import org.junit.Test;
import org.junit.Test;
@@ -46,7 +45,7 @@ public class MenuEduTooltipViewTest extends SysuiTestCase {


    @Before
    @Before
    public void setUp() throws Exception {
    public void setUp() throws Exception {
        setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG);
        setFlagDefaults(mSetFlagsRule);
        final WindowManager windowManager = mContext.getSystemService(WindowManager.class);
        final WindowManager windowManager = mContext.getSystemService(WindowManager.class);
        mMenuViewAppearance = new MenuViewAppearance(mContext, windowManager);
        mMenuViewAppearance = new MenuViewAppearance(mContext, windowManager);
        mMenuEduTooltipView = new MenuEduTooltipView(mContext, mMenuViewAppearance);
        mMenuEduTooltipView = new MenuEduTooltipView(mContext, mMenuViewAppearance);
+3 −4
Original line number Original line Diff line number Diff line
@@ -19,8 +19,7 @@ package com.android.systemui.accessibility.floatingmenu;
import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS;
import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS;


import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG;
import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults;
import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault;


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


@@ -40,8 +39,8 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate;
import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate;
import androidx.test.filters.SmallTest;
import androidx.test.filters.SmallTest;


import com.android.systemui.res.R;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.res.R;
import com.android.systemui.util.settings.SecureSettings;
import com.android.systemui.util.settings.SecureSettings;


import org.junit.Before;
import org.junit.Before;
@@ -75,7 +74,7 @@ public class MenuItemAccessibilityDelegateTest extends SysuiTestCase {


    @Before
    @Before
    public void setUp() {
    public void setUp() {
        setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG);
        setFlagDefaults(mSetFlagsRule);
        final WindowManager stubWindowManager = mContext.getSystemService(WindowManager.class);
        final WindowManager stubWindowManager = mContext.getSystemService(WindowManager.class);
        final MenuViewAppearance stubMenuViewAppearance = new MenuViewAppearance(mContext,
        final MenuViewAppearance stubMenuViewAppearance = new MenuViewAppearance(mContext,
                stubWindowManager);
                stubWindowManager);
Loading