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

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

Merge "Remove SetFlagsRule.setFlagDefault and usages; this is no longer required" into main

parents b48f0d09 1cbb0824

packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerBaseTest.java

+0 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.view.View.INVISIBLE; 
import static com.android.systemui.flags.Flags.FACE_AUTH_REFACTOR;

import static com.android.systemui.flags.Flags.LOCKSCREEN_WALLPAPER_DREAM_ENABLED;

import static com.android.systemui.flags.Flags.MIGRATE_KEYGUARD_STATUS_VIEW;

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



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.atLeast;
@@ -58,7 +57,6 @@ import com.android.systemui.statusbar.StatusBarState; 
import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController;

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.AlwaysOnDisplayNotificationIconViewStore;

import com.android.systemui.statusbar.notification.icon.ui.viewmodel.NotificationIconContainerAlwaysOnDisplayViewModel;

import com.android.systemui.statusbar.notification.shared.NotificationIconContainerRefactor;

import com.android.systemui.statusbar.phone.DozeParameters;

import com.android.systemui.statusbar.phone.NotificationIconAreaController;

import com.android.systemui.statusbar.phone.NotificationIconContainer;
@@ -144,7 +142,6 @@ public class KeyguardClockSwitchControllerBaseTest extends SysuiTestCase { 
    public void setup() {

        MockitoAnnotations.initMocks(this);



        setFlagDefault(mSetFlagsRule, NotificationIconContainerRefactor.FLAG_NAME);

        mFakeDateView.setTag(R.id.tag_smartspace_view, new Object());

        mFakeWeatherView.setTag(R.id.tag_smartspace_view, new Object());

        mFakeSmartspaceView.setTag(R.id.tag_smartspace_view, new Object());

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

+0 −3
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 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.accessibility.utils.FlagUtils.setFlagDefaults;



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



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


    @Before

    public void setUp() throws Exception {

        setFlagDefaults(mSetFlagsRule);

        MockitoAnnotations.initMocks(this);

        mContextWrapper = new ContextWrapper(mContext) {

            @Override

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

+0 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.accessibility.floatingmenu;



import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults;



import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

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


    @Before

    public void setUp() throws Exception {

        setFlagDefaults(mSetFlagsRule);

        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

+0 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.accessibility.floatingmenu;



import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults;



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



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


    @Before

    public void setUp() throws Exception {

        setFlagDefaults(mSetFlagsRule);

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

        final MenuViewAppearance stubMenuViewAppearance = new MenuViewAppearance(mContext,

                stubWindowManager);

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

+0 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.accessibility.floatingmenu;



import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults;



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



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


    @Before

    public void setUp() throws Exception {

        setFlagDefaults(mSetFlagsRule);

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

        mMenuViewAppearance = new MenuViewAppearance(mContext, windowManager);

        mMenuEduTooltipView = new MenuEduTooltipView(mContext, mMenuViewAppearance);