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

Commit a982e0c8 authored by Sunny Goyal's avatar Sunny Goyal Committed by Automerger Merge Worker
Browse files

Moving model data structures to a separate file am: e396abf5 

Change-Id: Ie1460415f62162a34e50eb2a2c6a1df99e07a18d
parents 21de9388 e396abf5

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/ComponentKeyMapper.java

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.launcher3.appprediction; 


import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKER;



import com.android.launcher3.AppInfo;

import com.android.launcher3.ItemInfoWithIcon;

import com.android.launcher3.allapps.AllAppsStore;

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

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

import com.android.launcher3.shortcuts.ShortcutKey;

import com.android.launcher3.util.ComponentKey;

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/DynamicItemCache.java

+2 −2
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ import androidx.annotation.Nullable; 
import androidx.annotation.UiThread;

import androidx.annotation.WorkerThread;



import com.android.launcher3.AppInfo;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.WorkspaceItemInfo;

import com.android.launcher3.allapps.AllAppsStore;

import com.android.launcher3.icons.IconCache;

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

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

import com.android.launcher3.shortcuts.ShortcutKey;

import com.android.launcher3.shortcuts.ShortcutRequest;

import com.android.launcher3.util.InstantAppResolver;

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/InstantAppItemInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKE 
import android.content.ComponentName;

import android.content.Intent;



import com.android.launcher3.AppInfo;

import com.android.launcher3.LauncherSettings;

import com.android.launcher3.WorkspaceItemInfo;

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

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



public class InstantAppItemInfo extends AppInfo {
@@ -44,7 +44,7 @@ public class InstantAppItemInfo extends AppInfo { 
        workspaceItemInfo.status = WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON

                | WorkspaceItemInfo.FLAG_RESTORE_STARTED

                | WorkspaceItemInfo.FLAG_SUPPORTS_WEB_UI;

        workspaceItemInfo.intent.setPackage(componentName.getPackageName());

        workspaceItemInfo.getIntent().setPackage(componentName.getPackageName());

        return workspaceItemInfo;

    }

}

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java

+4 −4
Original line number Diff line number Diff line
@@ -38,18 +38,14 @@ import android.widget.LinearLayout; 
import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.launcher3.AppInfo;

import com.android.launcher3.BubbleTextView;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;

import com.android.launcher3.ItemInfo;

import com.android.launcher3.ItemInfoWithIcon;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.LauncherSettings;

import com.android.launcher3.LauncherState;

import com.android.launcher3.R;

import com.android.launcher3.WorkspaceItemInfo;

import com.android.launcher3.allapps.AllAppsStore;

import com.android.launcher3.allapps.FloatingHeaderRow;

import com.android.launcher3.allapps.FloatingHeaderView;
@@ -60,6 +56,10 @@ import com.android.launcher3.keyboard.FocusIndicatorHelper; 
import com.android.launcher3.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper;

import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;

import com.android.launcher3.model.AppLaunchTracker;

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

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

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

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

import com.android.launcher3.touch.ItemClickHandler;

import com.android.launcher3.touch.ItemLongClickListener;

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

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ import androidx.annotation.NonNull; 


import com.android.launcher3.InvariantDeviceProfile;

import com.android.launcher3.InvariantDeviceProfile.OnIDPChangeListener;

import com.android.launcher3.ItemInfo;

import com.android.launcher3.ItemInfoWithIcon;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.LauncherSettings;
@@ -40,6 +38,8 @@ import com.android.launcher3.allapps.AllAppsContainerView; 
import com.android.launcher3.allapps.AllAppsStore.OnUpdateListener;

import com.android.launcher3.hybridhotseat.HotseatPredictionController;

import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;

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

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

import com.android.launcher3.shortcuts.ShortcutKey;

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

import com.android.launcher3.util.ComponentKey;