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

Commit 47dd148f authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-merger
Browse files

Merge "ShortcutInfo renamed to WorkspaceItemInfo" into ub-launcher3-qt-dev 

am: 762d1fc6

Change-Id: I3e6333f7df25f9244a03dc011ea205e393f7c92b
parents 31747c8c 762d1fc6

quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import com.android.launcher3.ItemInfo; 
import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.R;

import com.android.launcher3.ShortcutInfo;

import com.android.launcher3.WorkspaceItemInfo;

import com.android.launcher3.popup.SystemShortcut;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.launcher3.util.InstantAppResolver;
@@ -86,7 +86,7 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut 
    public View.OnClickListener getOnClickListener(BaseDraggingActivity activity, TaskView view) {

        Task task = view.getTask();



        ShortcutInfo dummyInfo = new ShortcutInfo();

        WorkspaceItemInfo dummyInfo = new WorkspaceItemInfo();

        dummyInfo.intent = new Intent();

        ComponentName component = task.getTopComponent();

        dummyInfo.intent.setComponent(component);

robolectric_tests/resources/cache_data_updated_task_data.txt

+1 −1
Original line number Diff line number Diff line 
# Model data used by CacheDataUpdatedTaskTest



classMap s com.android.launcher3.ShortcutInfo

classMap s com.android.launcher3.WorkspaceItemInfo



# Items for the BgDataModel

robolectric_tests/resources/package_install_state_change_task_data.txt

+1 −1
Original line number Diff line number Diff line 
# Model data used by PackageInstallStateChangeTaskTest



classMap s com.android.launcher3.ShortcutInfo

classMap s com.android.launcher3.WorkspaceItemInfo

classMap w com.android.launcher3.LauncherAppWidgetInfo



# Items for the BgDataModel

robolectric_tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java

+5 −10
Original line number Diff line number Diff line
@@ -7,19 +7,14 @@ import static org.mockito.Mockito.any; 
import static org.mockito.Mockito.verify;



import android.content.ComponentName;

import android.content.ContentProviderOperation;

import android.content.ContentValues;

import android.content.Context;

import android.content.Intent;

import android.graphics.Rect;

import android.net.Uri;

import android.util.Pair;



import com.android.launcher3.ItemInfo;

import com.android.launcher3.LauncherProvider;

import com.android.launcher3.LauncherSettings;

import com.android.launcher3.LauncherSettings.Favorites;

import com.android.launcher3.ShortcutInfo;

import com.android.launcher3.WorkspaceItemInfo;

import com.android.launcher3.util.ContentWriter;

import com.android.launcher3.util.GridOccupancy;

import com.android.launcher3.util.IntArray;
@@ -103,7 +98,7 @@ public class AddWorkspaceItemsTaskTest extends BaseModelUpdateTaskTestCase { 


    @Test

    public void testAddItem_existing_item_ignored() throws Exception {

        ShortcutInfo info = new ShortcutInfo();

        WorkspaceItemInfo info = new WorkspaceItemInfo();

        info.intent = new Intent().setComponent(mComponent1);



        // Setup a screen with a hole
@@ -115,10 +110,10 @@ public class AddWorkspaceItemsTaskTest extends BaseModelUpdateTaskTestCase { 


    @Test

    public void testAddItem_some_items_added() throws Exception {

        ShortcutInfo info = new ShortcutInfo();

        WorkspaceItemInfo info = new WorkspaceItemInfo();

        info.intent = new Intent().setComponent(mComponent1);



        ShortcutInfo info2 = new ShortcutInfo();

        WorkspaceItemInfo info2 = new WorkspaceItemInfo();

        info2.intent = new Intent().setComponent(mComponent2);



        // Setup a screen with a hole
@@ -155,7 +150,7 @@ public class AddWorkspaceItemsTaskTest extends BaseModelUpdateTaskTestCase { 
                    continue;

                }



                ShortcutInfo info = new ShortcutInfo();

                WorkspaceItemInfo info = new WorkspaceItemInfo();

                info.intent = new Intent().setComponent(mComponent1);

                info.id = startId++;

                info.screenId = screenId;

robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import static org.junit.Assert.assertNull; 


import com.android.launcher3.AppInfo;

import com.android.launcher3.ItemInfo;

import com.android.launcher3.ShortcutInfo;

import com.android.launcher3.WorkspaceItemInfo;



import org.junit.Before;

import org.junit.Ignore;
@@ -89,10 +89,10 @@ public class CacheDataUpdatedTaskTest extends BaseModelUpdateTaskTestCase { 
        for (ItemInfo info : bgDataModel.itemsIdMap) {

            if (updates.contains(info.id)) {

                assertEquals(NEW_LABEL_PREFIX + info.id, info.title);

                assertNotNull(((ShortcutInfo) info).iconBitmap);

                assertNotNull(((WorkspaceItemInfo) info).iconBitmap);

            } else {

                assertNotSame(NEW_LABEL_PREFIX + info.id, info.title);

                assertNull(((ShortcutInfo) info).iconBitmap);

                assertNull(((WorkspaceItemInfo) info).iconBitmap);

            }

        }

    }