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

Commit 5a1b3725 authored by Shamali P's avatar Shamali P
Browse files

Update references that read popup data provider to use picker provider 

Covers the UI references related to widget picker or its shortcut.

Test: Existing tests
Flag: EXEMPT minor refactoring
Bug: 353347512
Change-Id: Ifed1b7600ca9836df147949f3740ca1e89acd04a
parent 66614049

src/com/android/launcher3/popup/SystemShortcut.java

+8 −7
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH 
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_APP_INFO_TAP;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_DONT_SUGGEST_APP_TAP;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_WIDGETS_TAP;

import static com.android.launcher3.widget.picker.model.data.WidgetPickerDataUtils.findAllWidgetsForPackageUser;



import android.app.ActivityOptions;

import android.content.ComponentName;
@@ -28,7 +29,6 @@ import com.android.launcher3.R; 
import com.android.launcher3.SecondaryDropTarget;

import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.PrivateProfileManager;

import com.android.launcher3.model.WidgetItem;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.pm.UserCache;
@@ -39,9 +39,9 @@ import com.android.launcher3.util.PackageManagerHelper; 
import com.android.launcher3.util.PackageUserKey;

import com.android.launcher3.views.ActivityContext;

import com.android.launcher3.widget.WidgetsBottomSheet;

import com.android.launcher3.widget.picker.model.data.WidgetPickerData;



import java.util.Arrays;

import java.util.List;



/**

 * Represents a system shortcut for a given app. The shortcut should have a label and icon, and an
@@ -107,11 +107,12 @@ public abstract class SystemShortcut<T extends ActivityContext> extends ItemInfo 
    }



    public static final Factory<ActivityContext> WIDGETS = (context, itemInfo, originalView) -> {

        if (itemInfo.getTargetComponent() == null) return null;

        final List<WidgetItem> widgets =

                context.getPopupDataProvider().getWidgetsForPackageUser(new PackageUserKey(

                        itemInfo.getTargetComponent().getPackageName(), itemInfo.user));

        if (widgets.isEmpty()) {

        final PackageUserKey packageUserKey = PackageUserKey.fromItemInfo(itemInfo);

        if (packageUserKey == null) return null;



        final WidgetPickerData data = context.getWidgetPickerDataProvider().get();

        if (findAllWidgetsForPackageUser(data, packageUserKey).isEmpty()) {

            // hides widget picker shortcut if there are no widgets for the package.

            return null;

        }

        return new Widgets(context, itemInfo, originalView);

src/com/android/launcher3/widget/WidgetsBottomSheet.java

+6 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.launcher3.widget;



import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_BOTTOM_WIDGETS_TRAY;

import static com.android.launcher3.widget.picker.model.data.WidgetPickerDataUtils.findAllWidgetsForPackageUser;



import android.content.Context;

import android.graphics.Rect;
@@ -40,6 +41,7 @@ import com.android.launcher3.anim.PendingAnimation; 
import com.android.launcher3.model.WidgetItem;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.util.PackageUserKey;

import com.android.launcher3.widget.picker.model.data.WidgetPickerData;

import com.android.launcher3.widget.util.WidgetsTableUtils;



import java.util.List;
@@ -124,10 +126,10 @@ public class WidgetsBottomSheet extends BaseWidgetSheet { 


    @Override

    public void onWidgetsBound() {

        List<WidgetItem> widgets = mActivityContext.getPopupDataProvider().getWidgetsForPackageUser(

                new PackageUserKey(

                        mOriginalItemInfo.getTargetComponent().getPackageName(),

                        mOriginalItemInfo.user));

        final WidgetPickerData data = mActivityContext.getWidgetPickerDataProvider().get();

        final PackageUserKey packageUserKey = PackageUserKey.fromItemInfo(mOriginalItemInfo);

        List<WidgetItem> widgets = packageUserKey != null ? findAllWidgetsForPackageUser(data,

                packageUserKey) : List.of();



        TableLayout widgetsTable = findViewById(R.id.widgets_table);

        widgetsTable.removeAllViews();

src/com/android/launcher3/widget/picker/WidgetsFullSheet.java

+15 −12
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ import com.android.launcher3.workprofile.PersonalWorkPagedView; 
import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePageChangedListener;



import java.util.ArrayList;

import java.util.Collection;

import java.util.HashMap;

import java.util.List;

import java.util.Map;
@@ -471,7 +472,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet 
     * Returns all displayable widgets.

     */

    protected List<WidgetsListBaseEntry> getWidgetsToDisplay() {

        return mActivityContext.getPopupDataProvider().getAllWidgets();

        return mActivityContext.getWidgetPickerDataProvider().get().getAllWidgets();

    }



    @Override
@@ -572,12 +573,11 @@ public class WidgetsFullSheet extends BaseWidgetSheet 
        if (mIsInSearchMode) {

            return;

        }



        if (enableCategorizedWidgetSuggestions()) {

            // We avoid applying new recommendations when some are already displayed.

            if (mRecommendedWidgetsMap.isEmpty()) {

                mRecommendedWidgetsMap =

                        mActivityContext.getPopupDataProvider().getCategorizedRecommendedWidgets();

                        mActivityContext.getWidgetPickerDataProvider().get().getRecommendations();

            }

            mRecommendedWidgetsCount = mWidgetRecommendationsView.setRecommendations(

                    mRecommendedWidgetsMap,
@@ -589,9 +589,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet 
            );

        } else {

            if (mRecommendedWidgets.isEmpty()) {

                mRecommendedWidgets =

                        mActivityContext.getPopupDataProvider().getRecommendedWidgets();

            }

                mRecommendedWidgets = mActivityContext.getWidgetPickerDataProvider().get()

                        .getRecommendations()

                        .values().stream()

                        .flatMap(Collection::stream).toList();

                mRecommendedWidgetsCount = mWidgetRecommendationsView.setRecommendations(

                        mRecommendedWidgets,

                        mDeviceProfile,
@@ -600,6 +601,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet 
                        /* cellPadding= */ mWidgetCellHorizontalPadding

                );

            }

        }



        mWidgetRecommendationsContainer.setVisibility(

                mRecommendedWidgetsCount > 0 ? VISIBLE : GONE);

    }

src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java

+9 −8
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.launcher3.UtilitiesKt.CLIP_TO_PADDING_FALSE_MODIFIER; 
import static com.android.launcher3.UtilitiesKt.modifyAttributesOnViewTree;

import static com.android.launcher3.UtilitiesKt.restoreAttributesOnViewTree;

import static com.android.launcher3.widget.picker.WidgetsListItemAnimator.WIDGET_LIST_ITEM_APPEARANCE_DELAY;

import static com.android.launcher3.widget.picker.model.data.WidgetPickerDataUtils.findContentEntryForPackageUser;



import android.content.Context;

import android.graphics.Rect;
@@ -287,9 +288,9 @@ public class WidgetsTwoPaneSheet extends WidgetsFullSheet { 
    @Override

    protected List<WidgetsListBaseEntry> getWidgetsToDisplay() {

        List<WidgetsListBaseEntry> allWidgets =

                mActivityContext.getPopupDataProvider().getAllWidgets();

                mActivityContext.getWidgetPickerDataProvider().get().getAllWidgets();

        List<WidgetsListBaseEntry> defaultWidgets =

                mActivityContext.getPopupDataProvider().getDefaultWidgets();

                mActivityContext.getWidgetPickerDataProvider().get().getDefaultWidgets();



        if (allWidgets.isEmpty() || defaultWidgets.isEmpty()) {

            // no menu if there are no default widgets to show
@@ -359,7 +360,7 @@ public class WidgetsTwoPaneSheet extends WidgetsFullSheet { 
        WidgetsListHeaderEntry widgetsListHeaderEntry = WidgetsListHeaderEntry.create(

                        packageItemInfo,

                        /*titleSectionName=*/ suggestionsHeaderTitle,

                        /*items=*/ mActivityContext.getPopupDataProvider().getRecommendedWidgets(),

                        /*items=*/ List.of(), // not necessary

                        /*visibleWidgetsCount=*/ 0)

                .withWidgetListShown();
@@ -509,11 +510,11 @@ public class WidgetsTwoPaneSheet extends WidgetsFullSheet { 
                final boolean isUserClick = mSelectedHeader != null

                        && !getAccessibilityInitialFocusView().isAccessibilityFocused();

                mSelectedHeader = selectedHeader;

                WidgetsListContentEntry contentEntry =

                        mActivityContext.getPopupDataProvider().getSelectedAppWidgets(

                                selectedHeader, /*useDefault=*/

                                (mWidgetOptionsMenuState != null

                                        && !mWidgetOptionsMenuState.showAllWidgets));

                final boolean showDefaultWidgets = mWidgetOptionsMenuState != null

                        && !mWidgetOptionsMenuState.showAllWidgets;

                WidgetsListContentEntry contentEntry = findContentEntryForPackageUser(

                        mActivityContext.getWidgetPickerDataProvider().get(),

                        selectedHeader, showDefaultWidgets);



                if (contentEntry == null || mRightPane == null) {

                    return;

tests/src/com/android/launcher3/popup/SystemShortcutTest.java

+6 −6
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ import com.android.launcher3.util.LauncherMultivalentJUnit; 
import com.android.launcher3.util.TestSandboxModelContextWrapper;

import com.android.launcher3.util.UserIconInfo;

import com.android.launcher3.views.BaseDragLayer;

import com.android.launcher3.widget.picker.model.WidgetPickerDataProvider;

import com.android.launcher3.widget.picker.model.data.WidgetPickerData;



import org.junit.After;

import org.junit.Assert;
@@ -73,8 +75,6 @@ import org.junit.runner.RunWith; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import java.util.ArrayList;



@SmallTest

@RunWith(LauncherMultivalentJUnit.class)

public class SystemShortcutTest {
@@ -86,7 +86,7 @@ public class SystemShortcutTest { 
    private TestSandboxModelContextWrapper mTestContext;

    private final SandboxModelContext mSandboxContext = new SandboxModelContext();

    private PrivateProfileManager mPrivateProfileManager;

    private PopupDataProvider mPopupDataProvider;

    private WidgetPickerDataProvider mWidgetPickerDataProvider;

    private AppInfo mAppInfo;

    @Mock UserCache mUserCache;

    @Mock ApiWrapper mApiWrapper;
@@ -119,8 +119,8 @@ public class SystemShortcutTest { 
        spyOn(mPrivateProfileManager);

        when(mPrivateProfileManager.getProfileUser()).thenReturn(PRIVATE_HANDLE);



        mPopupDataProvider = mTestContext.getPopupDataProvider();

        spyOn(mPopupDataProvider);

        mWidgetPickerDataProvider = mTestContext.getWidgetPickerDataProvider();

        spyOn(mWidgetPickerDataProvider);

    }



    @After
@@ -141,7 +141,7 @@ public class SystemShortcutTest { 
        mAppInfo = new AppInfo();

        mAppInfo.componentName = new ComponentName(mTestContext, getClass());

        assertNotNull(mAppInfo.getTargetComponent());

        doReturn(new ArrayList<>()).when(mPopupDataProvider).getWidgetsForPackageUser(any());

        doReturn(new WidgetPickerData()).when(mWidgetPickerDataProvider).get();

        spyOn(mAppInfo);

        SystemShortcut systemShortcut = SystemShortcut.WIDGETS

                .getShortcut(mTestContext, mAppInfo, mView);