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

Commit bc1b3634 authored by Brian Isganitis's avatar Brian Isganitis Committed by Android (Google) Code Review
Browse files

Merge "Allow overriding getOptionsPopup test method." into sc-v2-dev

parents 0aadbc6b 149dbcb1

src/com/android/launcher3/Launcher.java

+10 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ import com.android.launcher3.model.data.WorkspaceItemInfo; 
import com.android.launcher3.notification.NotificationListener;

import com.android.launcher3.pm.PinRequestHelper;

import com.android.launcher3.pm.UserCache;

import com.android.launcher3.popup.ArrowPopup;

import com.android.launcher3.popup.PopupContainerWithArrow;

import com.android.launcher3.popup.PopupDataProvider;

import com.android.launcher3.popup.SystemShortcut;
@@ -3032,4 +3033,13 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
    public StatsLogManager getStatsLogManager() {

        return super.getStatsLogManager().withDefaultInstanceId(mAllAppsSessionLogId);

    }



    /**

     * Returns the current popup for testing, if any.

     */

    @VisibleForTesting

    @Nullable

    public ArrowPopup<?> getOptionsPopup() {

        return findViewById(R.id.popup_container);

    }

}

src/com/android/launcher3/views/OptionsPopupView.java

+0 −6
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.view.View.OnLongClickListener; 
import android.widget.Toast;



import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.core.content.ContextCompat;



import com.android.launcher3.AbstractFloatingView;
@@ -176,11 +175,6 @@ public class OptionsPopupView extends ArrowPopup<Launcher> 
        return children;

    }



    @VisibleForTesting

    public static ArrowPopup getOptionsPopup(Launcher launcher) {

        return launcher.findViewById(R.id.popup_container);

    }



    /**

     * Returns the list of supported actions

     */

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

+3 −4
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.launcher3.tapl.Folder; 
import com.android.launcher3.tapl.FolderIcon;

import com.android.launcher3.tapl.Widgets;

import com.android.launcher3.tapl.Workspace;

import com.android.launcher3.views.OptionsPopupView;

import com.android.launcher3.widget.picker.WidgetsFullSheet;

import com.android.launcher3.widget.picker.WidgetsRecyclerView;
@@ -102,8 +101,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
        mDevice.pressMenu();

        mDevice.waitForIdle();

        executeOnLauncher(

                launcher -> assertTrue("Launcher internal state didn't switch to Showing Menu",

                        OptionsPopupView.getOptionsPopup(launcher) != null));

                launcher -> assertNotNull("Launcher internal state didn't switch to Showing Menu",

                        launcher.getOptionsPopup()));

        // Check that pressHome works when the menu is shown.

        mLauncher.pressHome();

    }
@@ -286,7 +285,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
    }



    private boolean isOptionsPopupVisible(Launcher launcher) {

        final ArrowPopup popup = OptionsPopupView.getOptionsPopup(launcher);

        final ArrowPopup<?> popup = launcher.getOptionsPopup();

        return popup != null && popup.isShown();

    }