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

Commit 4389fdac authored by Riley Jones's avatar Riley Jones Committed by Android (Google) Code Review
Browse files

Merge "Cleanup of floating_menu_drag_to_edit" into main

parents d1550125 3d1d6334

packages/SystemUI/aconfig/accessibility.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -17,13 +17,6 @@ flag { 
    bug: "298718415"

}



flag {

    name: "floating_menu_drag_to_edit"

    namespace: "accessibility"

    description: "adds a second drag button to allow the user edit the shortcut."

    bug: "297583708"

}



flag {

    name: "floating_menu_ime_displacement_animation"

    namespace: "accessibility"

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

+2 −28
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.verify;



import android.annotation.NonNull;

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;
@@ -30,7 +28,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; 
import androidx.test.filters.SmallTest;



import com.android.settingslib.bluetooth.HearingAidDeviceManager;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.accessibility.utils.TestUtils;

import com.android.systemui.util.settings.SecureSettings;
@@ -75,13 +72,8 @@ public class DragToInteractAnimationControllerTest extends SysuiTestCase { 
        mInteractView = spy(new DragToInteractView(mContext, stubWindowManager));

        mDismissView = spy(new DismissView(mContext));



        if (Flags.floatingMenuDragToEdit()) {

        mDragToInteractAnimationController = new DragToInteractAnimationController(

                mInteractView, stubMenuView);

        } else {

            mDragToInteractAnimationController = new DragToInteractAnimationController(

                    mDismissView, stubMenuView);

        }



        mDragToInteractAnimationController.setMagnetListener(new MagnetizedObject.MagnetListener() {

            @Override
@@ -106,23 +98,6 @@ public class DragToInteractAnimationControllerTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT)

    public void showDismissView_success_old() {

        mDragToInteractAnimationController.showInteractView(true);



        verify(mDismissView).show();

    }



    @Test

    @DisableFlags(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT)

    public void hideDismissView_success_old() {

        mDragToInteractAnimationController.showInteractView(false);



        verify(mDismissView).hide();

    }



    @Test

    @EnableFlags(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT)

    public void showDismissView_success() {

        mDragToInteractAnimationController.showInteractView(true);
@@ -130,7 +105,6 @@ public class DragToInteractAnimationControllerTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT)

    public void hideDismissView_success() {

        mDragToInteractAnimationController.showInteractView(false);

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

+0 −15
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.verify;



import android.graphics.Rect;

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;
@@ -42,7 +40,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; 
import androidx.test.filters.SmallTest;



import com.android.settingslib.bluetooth.HearingAidDeviceManager;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.accessibility.utils.TestUtils;

import com.android.systemui.navigationbar.NavigationModeController;
@@ -113,18 +110,6 @@ public class MenuItemAccessibilityDelegateTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT)

    public void getAccessibilityActionList_matchSize_withoutEdit() {

        final AccessibilityNodeInfoCompat info =

                new AccessibilityNodeInfoCompat(new AccessibilityNodeInfo());



        mMenuItemAccessibilityDelegate.onInitializeAccessibilityNodeInfo(mStubListView, info);



        assertThat(info.getActionList().size()).isEqualTo(6);

    }



    @Test

    @EnableFlags(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT)

    public void getAccessibilityActionList_matchSize() {

        final AccessibilityNodeInfoCompat info =

                new AccessibilityNodeInfoCompat(new AccessibilityNodeInfo());

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

+2 −31
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.verify;



import android.graphics.PointF;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.testing.TestableLooper;

import android.view.MotionEvent;

import android.view.WindowManager;
@@ -43,7 +41,6 @@ import androidx.test.filters.SmallTest; 


import com.android.internal.accessibility.dialog.AccessibilityTarget;

import com.android.settingslib.bluetooth.HearingAidDeviceManager;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.accessibility.MotionEventHelper;

import com.android.systemui.accessibility.utils.TestUtils;
@@ -103,14 +100,8 @@ public class MenuListViewTouchHandlerTest extends SysuiTestCase { 
                mStubMenuView, stubMenuViewAppearance));

        mInteractView = spy(new DragToInteractView(mContext, windowManager));

        mDismissView = spy(new DismissView(mContext));



        if (Flags.floatingMenuDragToEdit()) {

        mDragToInteractAnimationController = spy(new DragToInteractAnimationController(

                mInteractView, mStubMenuView));

        } else {

            mDragToInteractAnimationController = spy(new DragToInteractAnimationController(

                    mDismissView, mStubMenuView));

        }



        mTouchHandler = new MenuListViewTouchHandler(mMenuAnimationController,

                mDragToInteractAnimationController);
@@ -155,26 +146,6 @@ public class MenuListViewTouchHandlerTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT)

    public void onActionMoveEvent_shouldShowDismissView() {

        final int offset = 100;

        final MotionEvent stubDownEvent =

                mMotionEventHelper.obtainMotionEvent(/* downTime= */ 0, /* eventTime= */ 1,

                        MotionEvent.ACTION_DOWN, mStubMenuView.getTranslationX(),

                        mStubMenuView.getTranslationY());

        final MotionEvent stubMoveEvent =

                mMotionEventHelper.obtainMotionEvent(/* downTime= */ 0, /* eventTime= */ 3,

                        MotionEvent.ACTION_MOVE, mStubMenuView.getTranslationX() + offset,

                        mStubMenuView.getTranslationY() + offset);



        mTouchHandler.onInterceptTouchEvent(mStubListView, stubDownEvent);

        mTouchHandler.onInterceptTouchEvent(mStubListView, stubMoveEvent);



        verify(mDismissView).show();

    }



    @Test

    @EnableFlags(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT)

    public void onActionMoveEvent_shouldShowInteractView() {

        final int offset = 100;

        final MotionEvent stubDownEvent =

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

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.accessibility.floatingmenu; 


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





import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;