2017-01-05 21:50:27 -08:00
|
|
|
/*
|
|
|
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
|
|
|
*
|
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
|
*
|
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
*
|
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
|
* limitations under the License.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
package com.android.launcher3.model;
|
|
|
|
|
|
2020-02-06 11:28:01 -08:00
|
|
|
import static android.graphics.BitmapFactory.decodeByteArray;
|
|
|
|
|
|
2017-01-05 21:50:27 -08:00
|
|
|
import android.content.ComponentName;
|
|
|
|
|
import android.content.ContentValues;
|
|
|
|
|
import android.content.Context;
|
|
|
|
|
import android.content.Intent;
|
|
|
|
|
import android.content.Intent.ShortcutIconResource;
|
2017-01-05 15:22:41 -08:00
|
|
|
import android.content.pm.LauncherActivityInfo;
|
2019-10-02 16:13:34 -07:00
|
|
|
import android.content.pm.LauncherApps;
|
2018-11-05 17:19:45 -08:00
|
|
|
import android.content.pm.PackageManager;
|
2017-01-05 21:50:27 -08:00
|
|
|
import android.database.Cursor;
|
|
|
|
|
import android.database.CursorWrapper;
|
Render user's actual workspace in ThemePicker preview (Part 3)
go/grid-migration-preview
With this change, we can see actual grid migration in wallpaper preview.
The approach here: we use a tmp table (favorites_preview) here specifically for this preview (to write off the migration results), and load from this tmp table workspace items if migration is necessary and successful. Otherwise, we load from the current workspace.
UPDATED: this change should be completely compatible with the new multi-db grid migration algorithm. Here is why
1. In LauncherPreviewRender#renderScreenShot, I added a check to decide which grid migration preview method we should call. Once v2 preview method is implemented, it should be integrated with other parts of this change perfectly (the reason will be mentioned below).
2. While we have multiple DBs, mOpenHelper in LauncherProvider always points to the current db we are using. Queries using CONTENT_URI is routed to whatever DB mOpenHelper points to, so it works perfectly to directly operate on CONTENT_URI even when we use multi-db underneath the hood.
3. With 1 and 2 mentioned, I believe in order for this preview change to support multi-db, we only need to implement the V2 grid migration algorithm. Because most of what we are doing in this change is wrapped in GridSizeMigrationTask, it's perfectly safeguarded.
Bug: 144052839
Change-Id: Ie6d6048d77326f96546c8a180a7cd8f15b47e4c4
2020-01-12 01:07:59 -08:00
|
|
|
import android.net.Uri;
|
2017-01-05 21:50:27 -08:00
|
|
|
import android.os.UserHandle;
|
|
|
|
|
import android.provider.BaseColumns;
|
|
|
|
|
import android.text.TextUtils;
|
|
|
|
|
import android.util.Log;
|
|
|
|
|
import android.util.LongSparseArray;
|
|
|
|
|
|
2021-01-12 19:30:02 +00:00
|
|
|
import androidx.annotation.Nullable;
|
2020-03-26 01:48:24 -07:00
|
|
|
import androidx.annotation.VisibleForTesting;
|
|
|
|
|
|
2017-01-05 21:50:27 -08:00
|
|
|
import com.android.launcher3.InvariantDeviceProfile;
|
|
|
|
|
import com.android.launcher3.LauncherAppState;
|
|
|
|
|
import com.android.launcher3.LauncherSettings;
|
2021-01-12 19:30:02 +00:00
|
|
|
import com.android.launcher3.LauncherSettings.Favorites;
|
2017-01-05 21:50:27 -08:00
|
|
|
import com.android.launcher3.Utilities;
|
|
|
|
|
import com.android.launcher3.Workspace;
|
|
|
|
|
import com.android.launcher3.config.FeatureFlags;
|
2018-09-25 17:03:34 -07:00
|
|
|
import com.android.launcher3.icons.BitmapInfo;
|
2019-10-02 16:13:34 -07:00
|
|
|
import com.android.launcher3.icons.IconCache;
|
2018-09-25 17:03:34 -07:00
|
|
|
import com.android.launcher3.icons.LauncherIcons;
|
2017-01-05 21:50:27 -08:00
|
|
|
import com.android.launcher3.logging.FileLog;
|
2020-04-06 15:11:17 -07:00
|
|
|
import com.android.launcher3.model.data.AppInfo;
|
|
|
|
|
import com.android.launcher3.model.data.ItemInfo;
|
|
|
|
|
import com.android.launcher3.model.data.WorkspaceItemInfo;
|
2017-01-05 21:50:27 -08:00
|
|
|
import com.android.launcher3.util.ContentWriter;
|
|
|
|
|
import com.android.launcher3.util.GridOccupancy;
|
2018-10-04 15:11:00 -07:00
|
|
|
import com.android.launcher3.util.IntArray;
|
|
|
|
|
import com.android.launcher3.util.IntSparseArrayMap;
|
2017-01-05 21:50:27 -08:00
|
|
|
|
2017-01-14 15:05:14 -08:00
|
|
|
import java.net.URISyntaxException;
|
2017-01-05 21:50:27 -08:00
|
|
|
import java.security.InvalidParameterException;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Extension of {@link Cursor} with utility methods for workspace loading.
|
|
|
|
|
*/
|
|
|
|
|
public class LoaderCursor extends CursorWrapper {
|
|
|
|
|
|
|
|
|
|
private static final String TAG = "LoaderCursor";
|
|
|
|
|
|
2020-07-29 15:03:46 -07:00
|
|
|
private final LongSparseArray<UserHandle> allUsers;
|
2017-01-05 21:50:27 -08:00
|
|
|
|
Render user's actual workspace in ThemePicker preview (Part 3)
go/grid-migration-preview
With this change, we can see actual grid migration in wallpaper preview.
The approach here: we use a tmp table (favorites_preview) here specifically for this preview (to write off the migration results), and load from this tmp table workspace items if migration is necessary and successful. Otherwise, we load from the current workspace.
UPDATED: this change should be completely compatible with the new multi-db grid migration algorithm. Here is why
1. In LauncherPreviewRender#renderScreenShot, I added a check to decide which grid migration preview method we should call. Once v2 preview method is implemented, it should be integrated with other parts of this change perfectly (the reason will be mentioned below).
2. While we have multiple DBs, mOpenHelper in LauncherProvider always points to the current db we are using. Queries using CONTENT_URI is routed to whatever DB mOpenHelper points to, so it works perfectly to directly operate on CONTENT_URI even when we use multi-db underneath the hood.
3. With 1 and 2 mentioned, I believe in order for this preview change to support multi-db, we only need to implement the V2 grid migration algorithm. Because most of what we are doing in this change is wrapped in GridSizeMigrationTask, it's perfectly safeguarded.
Bug: 144052839
Change-Id: Ie6d6048d77326f96546c8a180a7cd8f15b47e4c4
2020-01-12 01:07:59 -08:00
|
|
|
private final Uri mContentUri;
|
2017-01-05 21:50:27 -08:00
|
|
|
private final Context mContext;
|
2018-11-05 17:19:45 -08:00
|
|
|
private final PackageManager mPM;
|
2017-01-05 21:50:27 -08:00
|
|
|
private final IconCache mIconCache;
|
|
|
|
|
private final InvariantDeviceProfile mIDP;
|
|
|
|
|
|
2018-10-04 15:11:00 -07:00
|
|
|
private final IntArray itemsToRemove = new IntArray();
|
|
|
|
|
private final IntArray restoredRows = new IntArray();
|
|
|
|
|
private final IntSparseArrayMap<GridOccupancy> occupied = new IntSparseArrayMap<>();
|
2017-01-05 21:50:27 -08:00
|
|
|
|
|
|
|
|
private final int iconPackageIndex;
|
|
|
|
|
private final int iconResourceIndex;
|
|
|
|
|
private final int iconIndex;
|
|
|
|
|
public final int titleIndex;
|
|
|
|
|
|
|
|
|
|
private final int idIndex;
|
|
|
|
|
private final int containerIndex;
|
|
|
|
|
private final int itemTypeIndex;
|
|
|
|
|
private final int screenIndex;
|
|
|
|
|
private final int cellXIndex;
|
|
|
|
|
private final int cellYIndex;
|
|
|
|
|
private final int profileIdIndex;
|
2017-01-11 14:33:38 -08:00
|
|
|
private final int restoredIndex;
|
2017-01-14 15:05:14 -08:00
|
|
|
private final int intentIndex;
|
2017-01-05 21:50:27 -08:00
|
|
|
|
2021-01-12 19:30:02 +00:00
|
|
|
@Nullable
|
|
|
|
|
private LauncherActivityInfo mActivityInfo;
|
|
|
|
|
|
2017-01-05 21:50:27 -08:00
|
|
|
// Properties loaded per iteration
|
|
|
|
|
public long serialNumber;
|
|
|
|
|
public UserHandle user;
|
2018-10-04 15:11:00 -07:00
|
|
|
public int id;
|
|
|
|
|
public int container;
|
2017-01-05 21:50:27 -08:00
|
|
|
public int itemType;
|
2017-01-11 14:33:38 -08:00
|
|
|
public int restoreFlag;
|
2017-01-05 21:50:27 -08:00
|
|
|
|
2020-06-08 17:06:09 -07:00
|
|
|
public LoaderCursor(Cursor cursor, Uri contentUri, LauncherAppState app,
|
|
|
|
|
UserManagerState userManagerState) {
|
Render user's actual workspace in ThemePicker preview (Part 3)
go/grid-migration-preview
With this change, we can see actual grid migration in wallpaper preview.
The approach here: we use a tmp table (favorites_preview) here specifically for this preview (to write off the migration results), and load from this tmp table workspace items if migration is necessary and successful. Otherwise, we load from the current workspace.
UPDATED: this change should be completely compatible with the new multi-db grid migration algorithm. Here is why
1. In LauncherPreviewRender#renderScreenShot, I added a check to decide which grid migration preview method we should call. Once v2 preview method is implemented, it should be integrated with other parts of this change perfectly (the reason will be mentioned below).
2. While we have multiple DBs, mOpenHelper in LauncherProvider always points to the current db we are using. Queries using CONTENT_URI is routed to whatever DB mOpenHelper points to, so it works perfectly to directly operate on CONTENT_URI even when we use multi-db underneath the hood.
3. With 1 and 2 mentioned, I believe in order for this preview change to support multi-db, we only need to implement the V2 grid migration algorithm. Because most of what we are doing in this change is wrapped in GridSizeMigrationTask, it's perfectly safeguarded.
Bug: 144052839
Change-Id: Ie6d6048d77326f96546c8a180a7cd8f15b47e4c4
2020-01-12 01:07:59 -08:00
|
|
|
super(cursor);
|
|
|
|
|
|
2020-06-08 17:06:09 -07:00
|
|
|
allUsers = userManagerState.allUsers;
|
Render user's actual workspace in ThemePicker preview (Part 3)
go/grid-migration-preview
With this change, we can see actual grid migration in wallpaper preview.
The approach here: we use a tmp table (favorites_preview) here specifically for this preview (to write off the migration results), and load from this tmp table workspace items if migration is necessary and successful. Otherwise, we load from the current workspace.
UPDATED: this change should be completely compatible with the new multi-db grid migration algorithm. Here is why
1. In LauncherPreviewRender#renderScreenShot, I added a check to decide which grid migration preview method we should call. Once v2 preview method is implemented, it should be integrated with other parts of this change perfectly (the reason will be mentioned below).
2. While we have multiple DBs, mOpenHelper in LauncherProvider always points to the current db we are using. Queries using CONTENT_URI is routed to whatever DB mOpenHelper points to, so it works perfectly to directly operate on CONTENT_URI even when we use multi-db underneath the hood.
3. With 1 and 2 mentioned, I believe in order for this preview change to support multi-db, we only need to implement the V2 grid migration algorithm. Because most of what we are doing in this change is wrapped in GridSizeMigrationTask, it's perfectly safeguarded.
Bug: 144052839
Change-Id: Ie6d6048d77326f96546c8a180a7cd8f15b47e4c4
2020-01-12 01:07:59 -08:00
|
|
|
mContentUri = contentUri;
|
2017-01-05 21:50:27 -08:00
|
|
|
mContext = app.getContext();
|
|
|
|
|
mIconCache = app.getIconCache();
|
|
|
|
|
mIDP = app.getInvariantDeviceProfile();
|
2018-11-05 17:19:45 -08:00
|
|
|
mPM = mContext.getPackageManager();
|
2017-01-05 21:50:27 -08:00
|
|
|
|
|
|
|
|
// Init column indices
|
|
|
|
|
iconIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.ICON);
|
|
|
|
|
iconPackageIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.ICON_PACKAGE);
|
|
|
|
|
iconResourceIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.ICON_RESOURCE);
|
|
|
|
|
titleIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.TITLE);
|
|
|
|
|
|
|
|
|
|
idIndex = getColumnIndexOrThrow(LauncherSettings.Favorites._ID);
|
|
|
|
|
containerIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.CONTAINER);
|
|
|
|
|
itemTypeIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.ITEM_TYPE);
|
|
|
|
|
screenIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.SCREEN);
|
|
|
|
|
cellXIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.CELLX);
|
|
|
|
|
cellYIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.CELLY);
|
|
|
|
|
profileIdIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.PROFILE_ID);
|
2017-01-11 14:33:38 -08:00
|
|
|
restoredIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.RESTORED);
|
2017-01-14 15:05:14 -08:00
|
|
|
intentIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.INTENT);
|
2017-01-05 21:50:27 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public boolean moveToNext() {
|
|
|
|
|
boolean result = super.moveToNext();
|
|
|
|
|
if (result) {
|
2021-01-12 19:30:02 +00:00
|
|
|
mActivityInfo = null;
|
|
|
|
|
|
2017-01-05 21:50:27 -08:00
|
|
|
// Load common properties.
|
|
|
|
|
itemType = getInt(itemTypeIndex);
|
|
|
|
|
container = getInt(containerIndex);
|
2018-10-04 15:11:00 -07:00
|
|
|
id = getInt(idIndex);
|
2017-01-05 21:50:27 -08:00
|
|
|
serialNumber = getInt(profileIdIndex);
|
|
|
|
|
user = allUsers.get(serialNumber);
|
2017-01-11 14:33:38 -08:00
|
|
|
restoreFlag = getInt(restoredIndex);
|
2017-01-05 21:50:27 -08:00
|
|
|
}
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-14 15:05:14 -08:00
|
|
|
public Intent parseIntent() {
|
|
|
|
|
String intentDescription = getString(intentIndex);
|
|
|
|
|
try {
|
|
|
|
|
return TextUtils.isEmpty(intentDescription) ?
|
|
|
|
|
null : Intent.parseUri(intentDescription, 0);
|
|
|
|
|
} catch (URISyntaxException e) {
|
|
|
|
|
Log.e(TAG, "Error parsing Intent");
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-26 01:48:24 -07:00
|
|
|
@VisibleForTesting
|
2019-03-27 16:03:06 -07:00
|
|
|
public WorkspaceItemInfo loadSimpleWorkspaceItem() {
|
|
|
|
|
final WorkspaceItemInfo info = new WorkspaceItemInfo();
|
2020-03-26 01:48:24 -07:00
|
|
|
info.intent = new Intent();
|
2017-01-05 21:50:27 -08:00
|
|
|
// Non-app shortcuts are only supported for current user.
|
|
|
|
|
info.user = user;
|
|
|
|
|
info.itemType = itemType;
|
|
|
|
|
info.title = getTitle();
|
|
|
|
|
// the fallback icon
|
2017-12-19 16:49:24 -08:00
|
|
|
if (!loadIcon(info)) {
|
2019-10-25 13:41:28 -07:00
|
|
|
info.bitmap = mIconCache.getDefaultIcon(info.user);
|
2017-01-05 21:50:27 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO: If there's an explicit component and we can't install that, delete it.
|
|
|
|
|
|
|
|
|
|
return info;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Loads the icon from the cursor and updates the {@param info} if the icon is an app resource.
|
|
|
|
|
*/
|
2019-03-27 16:03:06 -07:00
|
|
|
protected boolean loadIcon(WorkspaceItemInfo info) {
|
2018-11-29 12:13:47 -08:00
|
|
|
try (LauncherIcons li = LauncherIcons.obtain(mContext)) {
|
2020-02-06 11:28:01 -08:00
|
|
|
if (itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT) {
|
|
|
|
|
String packageName = getString(iconPackageIndex);
|
|
|
|
|
String resourceName = getString(iconResourceIndex);
|
|
|
|
|
if (!TextUtils.isEmpty(packageName) || !TextUtils.isEmpty(resourceName)) {
|
|
|
|
|
info.iconResource = new ShortcutIconResource();
|
|
|
|
|
info.iconResource.packageName = packageName;
|
|
|
|
|
info.iconResource.resourceName = resourceName;
|
|
|
|
|
BitmapInfo iconInfo = li.createIconBitmap(info.iconResource);
|
|
|
|
|
if (iconInfo != null) {
|
|
|
|
|
info.bitmap = iconInfo;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
2017-12-19 16:49:24 -08:00
|
|
|
}
|
2017-01-05 21:50:27 -08:00
|
|
|
}
|
2017-12-19 16:49:24 -08:00
|
|
|
|
2020-02-06 11:28:01 -08:00
|
|
|
// Failed to load from resource, try loading from DB.
|
|
|
|
|
byte[] data = getBlob(iconIndex);
|
|
|
|
|
try {
|
|
|
|
|
info.bitmap = li.createIconBitmap(decodeByteArray(data, 0, data.length));
|
|
|
|
|
return true;
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
Log.e(TAG, "Failed to decode byte array for info " + info, e);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2017-06-27 21:24:32 -07:00
|
|
|
}
|
2017-01-05 21:50:27 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Returns the title or empty string
|
|
|
|
|
*/
|
|
|
|
|
private String getTitle() {
|
|
|
|
|
String title = getString(titleIndex);
|
|
|
|
|
return TextUtils.isEmpty(title) ? "" : Utilities.trim(title);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
2019-03-27 16:03:06 -07:00
|
|
|
* Make an WorkspaceItemInfo object for a restored application or shortcut item that points
|
2017-01-05 21:50:27 -08:00
|
|
|
* to a package that is not yet installed on the system.
|
|
|
|
|
*/
|
2019-03-27 16:03:06 -07:00
|
|
|
public WorkspaceItemInfo getRestoredItemInfo(Intent intent) {
|
|
|
|
|
final WorkspaceItemInfo info = new WorkspaceItemInfo();
|
2017-01-05 21:50:27 -08:00
|
|
|
info.user = user;
|
2017-01-12 16:55:36 -08:00
|
|
|
info.intent = intent;
|
2017-01-05 21:50:27 -08:00
|
|
|
|
|
|
|
|
// the fallback icon
|
2017-12-19 16:49:24 -08:00
|
|
|
if (!loadIcon(info)) {
|
2017-01-05 21:50:27 -08:00
|
|
|
mIconCache.getTitleAndIcon(info, false /* useLowResIcon */);
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-27 16:03:06 -07:00
|
|
|
if (hasRestoreFlag(WorkspaceItemInfo.FLAG_RESTORED_ICON)) {
|
2017-01-05 21:50:27 -08:00
|
|
|
String title = getTitle();
|
|
|
|
|
if (!TextUtils.isEmpty(title)) {
|
|
|
|
|
info.title = Utilities.trim(title);
|
|
|
|
|
}
|
2019-08-19 13:32:09 -07:00
|
|
|
} else if (hasRestoreFlag(WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON)) {
|
2017-01-05 21:50:27 -08:00
|
|
|
if (TextUtils.isEmpty(info.title)) {
|
|
|
|
|
info.title = getTitle();
|
|
|
|
|
}
|
|
|
|
|
} else {
|
2017-01-11 14:33:38 -08:00
|
|
|
throw new InvalidParameterException("Invalid restoreType " + restoreFlag);
|
2017-01-05 21:50:27 -08:00
|
|
|
}
|
|
|
|
|
|
2018-11-05 17:19:45 -08:00
|
|
|
info.contentDescription = mPM.getUserBadgedLabel(info.title, info.user);
|
2017-01-05 21:50:27 -08:00
|
|
|
info.itemType = itemType;
|
2017-01-11 14:33:38 -08:00
|
|
|
info.status = restoreFlag;
|
2017-01-05 21:50:27 -08:00
|
|
|
return info;
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-12 19:30:02 +00:00
|
|
|
public LauncherActivityInfo getLauncherActivityInfo() {
|
|
|
|
|
return mActivityInfo;
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-05 21:50:27 -08:00
|
|
|
/**
|
2019-03-27 16:03:06 -07:00
|
|
|
* Make an WorkspaceItemInfo object for a shortcut that is an application.
|
2017-01-05 21:50:27 -08:00
|
|
|
*/
|
2019-03-27 16:03:06 -07:00
|
|
|
public WorkspaceItemInfo getAppShortcutInfo(
|
2017-01-05 21:50:27 -08:00
|
|
|
Intent intent, boolean allowMissingTarget, boolean useLowResIcon) {
|
|
|
|
|
if (user == null) {
|
|
|
|
|
Log.d(TAG, "Null user found in getShortcutInfo");
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ComponentName componentName = intent.getComponent();
|
|
|
|
|
if (componentName == null) {
|
|
|
|
|
Log.d(TAG, "Missing component found in getShortcutInfo");
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Intent newIntent = new Intent(Intent.ACTION_MAIN, null);
|
|
|
|
|
newIntent.addCategory(Intent.CATEGORY_LAUNCHER);
|
|
|
|
|
newIntent.setComponent(componentName);
|
2021-01-12 19:30:02 +00:00
|
|
|
mActivityInfo = mContext.getSystemService(LauncherApps.class)
|
2017-01-05 21:50:27 -08:00
|
|
|
.resolveActivity(newIntent, user);
|
2021-01-12 19:30:02 +00:00
|
|
|
if ((mActivityInfo == null) && !allowMissingTarget) {
|
2017-01-05 21:50:27 -08:00
|
|
|
Log.d(TAG, "Missing activity found in getShortcutInfo: " + componentName);
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-27 16:03:06 -07:00
|
|
|
final WorkspaceItemInfo info = new WorkspaceItemInfo();
|
2021-01-12 19:30:02 +00:00
|
|
|
info.itemType = Favorites.ITEM_TYPE_APPLICATION;
|
2017-01-05 21:50:27 -08:00
|
|
|
info.user = user;
|
|
|
|
|
info.intent = newIntent;
|
|
|
|
|
|
2021-01-12 19:30:02 +00:00
|
|
|
mIconCache.getTitleAndIcon(info, mActivityInfo, useLowResIcon);
|
2019-10-25 13:41:28 -07:00
|
|
|
if (mIconCache.isDefaultIcon(info.bitmap, user)) {
|
2017-12-19 16:49:24 -08:00
|
|
|
loadIcon(info);
|
2017-01-05 21:50:27 -08:00
|
|
|
}
|
|
|
|
|
|
2021-01-12 19:30:02 +00:00
|
|
|
if (mActivityInfo != null) {
|
|
|
|
|
AppInfo.updateRuntimeFlagsForActivityTarget(info, mActivityInfo);
|
2017-01-05 21:50:27 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// from the db
|
|
|
|
|
if (TextUtils.isEmpty(info.title)) {
|
|
|
|
|
info.title = getTitle();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// fall back to the class name of the activity
|
|
|
|
|
if (info.title == null) {
|
|
|
|
|
info.title = componentName.getClassName();
|
|
|
|
|
}
|
|
|
|
|
|
2018-11-05 17:19:45 -08:00
|
|
|
info.contentDescription = mPM.getUserBadgedLabel(info.title, info.user);
|
2017-01-05 21:50:27 -08:00
|
|
|
return info;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Returns a {@link ContentWriter} which can be used to update the current item.
|
|
|
|
|
*/
|
|
|
|
|
public ContentWriter updater() {
|
|
|
|
|
return new ContentWriter(mContext, new ContentWriter.CommitParams(
|
2018-10-04 15:11:00 -07:00
|
|
|
BaseColumns._ID + "= ?", new String[]{Integer.toString(id)}));
|
2017-01-05 21:50:27 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Marks the current item for removal
|
|
|
|
|
*/
|
|
|
|
|
public void markDeleted(String reason) {
|
|
|
|
|
FileLog.e(TAG, reason);
|
|
|
|
|
itemsToRemove.add(id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Removes any items marked for removal.
|
|
|
|
|
* @return true is any item was removed.
|
|
|
|
|
*/
|
|
|
|
|
public boolean commitDeleted() {
|
|
|
|
|
if (itemsToRemove.size() > 0) {
|
|
|
|
|
// Remove dead items
|
Render user's actual workspace in ThemePicker preview (Part 3)
go/grid-migration-preview
With this change, we can see actual grid migration in wallpaper preview.
The approach here: we use a tmp table (favorites_preview) here specifically for this preview (to write off the migration results), and load from this tmp table workspace items if migration is necessary and successful. Otherwise, we load from the current workspace.
UPDATED: this change should be completely compatible with the new multi-db grid migration algorithm. Here is why
1. In LauncherPreviewRender#renderScreenShot, I added a check to decide which grid migration preview method we should call. Once v2 preview method is implemented, it should be integrated with other parts of this change perfectly (the reason will be mentioned below).
2. While we have multiple DBs, mOpenHelper in LauncherProvider always points to the current db we are using. Queries using CONTENT_URI is routed to whatever DB mOpenHelper points to, so it works perfectly to directly operate on CONTENT_URI even when we use multi-db underneath the hood.
3. With 1 and 2 mentioned, I believe in order for this preview change to support multi-db, we only need to implement the V2 grid migration algorithm. Because most of what we are doing in this change is wrapped in GridSizeMigrationTask, it's perfectly safeguarded.
Bug: 144052839
Change-Id: Ie6d6048d77326f96546c8a180a7cd8f15b47e4c4
2020-01-12 01:07:59 -08:00
|
|
|
mContext.getContentResolver().delete(mContentUri, Utilities.createDbSelectionQuery(
|
|
|
|
|
LauncherSettings.Favorites._ID, itemsToRemove), null);
|
2017-01-05 21:50:27 -08:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Marks the current item as restored
|
|
|
|
|
*/
|
|
|
|
|
public void markRestored() {
|
2017-01-11 14:33:38 -08:00
|
|
|
if (restoreFlag != 0) {
|
|
|
|
|
restoredRows.add(id);
|
|
|
|
|
restoreFlag = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public boolean hasRestoreFlag(int flagMask) {
|
|
|
|
|
return (restoreFlag & flagMask) != 0;
|
2017-01-05 21:50:27 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void commitRestoredItems() {
|
|
|
|
|
if (restoredRows.size() > 0) {
|
|
|
|
|
// Update restored items that no longer require special handling
|
|
|
|
|
ContentValues values = new ContentValues();
|
|
|
|
|
values.put(LauncherSettings.Favorites.RESTORED, 0);
|
Render user's actual workspace in ThemePicker preview (Part 3)
go/grid-migration-preview
With this change, we can see actual grid migration in wallpaper preview.
The approach here: we use a tmp table (favorites_preview) here specifically for this preview (to write off the migration results), and load from this tmp table workspace items if migration is necessary and successful. Otherwise, we load from the current workspace.
UPDATED: this change should be completely compatible with the new multi-db grid migration algorithm. Here is why
1. In LauncherPreviewRender#renderScreenShot, I added a check to decide which grid migration preview method we should call. Once v2 preview method is implemented, it should be integrated with other parts of this change perfectly (the reason will be mentioned below).
2. While we have multiple DBs, mOpenHelper in LauncherProvider always points to the current db we are using. Queries using CONTENT_URI is routed to whatever DB mOpenHelper points to, so it works perfectly to directly operate on CONTENT_URI even when we use multi-db underneath the hood.
3. With 1 and 2 mentioned, I believe in order for this preview change to support multi-db, we only need to implement the V2 grid migration algorithm. Because most of what we are doing in this change is wrapped in GridSizeMigrationTask, it's perfectly safeguarded.
Bug: 144052839
Change-Id: Ie6d6048d77326f96546c8a180a7cd8f15b47e4c4
2020-01-12 01:07:59 -08:00
|
|
|
mContext.getContentResolver().update(mContentUri, values,
|
2017-01-05 21:50:27 -08:00
|
|
|
Utilities.createDbSelectionQuery(
|
|
|
|
|
LauncherSettings.Favorites._ID, restoredRows), null);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Returns true is the item is on workspace or hotseat
|
|
|
|
|
*/
|
|
|
|
|
public boolean isOnWorkspaceOrHotseat() {
|
|
|
|
|
return container == LauncherSettings.Favorites.CONTAINER_DESKTOP ||
|
|
|
|
|
container == LauncherSettings.Favorites.CONTAINER_HOTSEAT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Applies the following properties:
|
|
|
|
|
* {@link ItemInfo#id}
|
|
|
|
|
* {@link ItemInfo#container}
|
|
|
|
|
* {@link ItemInfo#screenId}
|
|
|
|
|
* {@link ItemInfo#cellX}
|
|
|
|
|
* {@link ItemInfo#cellY}
|
|
|
|
|
*/
|
|
|
|
|
public void applyCommonProperties(ItemInfo info) {
|
|
|
|
|
info.id = id;
|
|
|
|
|
info.container = container;
|
|
|
|
|
info.screenId = getInt(screenIndex);
|
|
|
|
|
info.cellX = getInt(cellXIndex);
|
|
|
|
|
info.cellY = getInt(cellYIndex);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Adds the {@param info} to {@param dataModel} if it does not overlap with any other item,
|
|
|
|
|
* otherwise marks it for deletion.
|
|
|
|
|
*/
|
|
|
|
|
public void checkAndAddItem(ItemInfo info, BgDataModel dataModel) {
|
2018-12-07 11:43:47 -08:00
|
|
|
if (checkItemPlacement(info)) {
|
2017-01-11 10:48:34 -08:00
|
|
|
dataModel.addItem(mContext, info, false);
|
2017-01-05 21:50:27 -08:00
|
|
|
} else {
|
|
|
|
|
markDeleted("Item position overlap");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* check & update map of what's occupied; used to discard overlapping/invalid items
|
|
|
|
|
*/
|
2018-12-07 11:43:47 -08:00
|
|
|
protected boolean checkItemPlacement(ItemInfo item) {
|
2018-10-04 15:11:00 -07:00
|
|
|
int containerIndex = item.screenId;
|
2017-01-05 21:50:27 -08:00
|
|
|
if (item.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
|
|
|
|
|
final GridOccupancy hotseatOccupancy =
|
2018-10-04 15:11:00 -07:00
|
|
|
occupied.get(LauncherSettings.Favorites.CONTAINER_HOTSEAT);
|
2017-01-05 21:50:27 -08:00
|
|
|
|
2021-04-07 15:02:37 -07:00
|
|
|
if (item.screenId >= mIDP.numDatabaseHotseatIcons) {
|
2017-01-05 21:50:27 -08:00
|
|
|
Log.e(TAG, "Error loading shortcut " + item
|
|
|
|
|
+ " into hotseat position " + item.screenId
|
2021-04-07 15:02:37 -07:00
|
|
|
+ ", position out of bounds: (0 to " + (mIDP.numDatabaseHotseatIcons - 1)
|
2017-01-05 21:50:27 -08:00
|
|
|
+ ")");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (hotseatOccupancy != null) {
|
|
|
|
|
if (hotseatOccupancy.cells[(int) item.screenId][0]) {
|
|
|
|
|
Log.e(TAG, "Error loading shortcut into hotseat " + item
|
|
|
|
|
+ " into position (" + item.screenId + ":" + item.cellX + ","
|
|
|
|
|
+ item.cellY + ") already occupied");
|
|
|
|
|
return false;
|
|
|
|
|
} else {
|
2018-10-04 15:11:00 -07:00
|
|
|
hotseatOccupancy.cells[item.screenId][0] = true;
|
2017-01-05 21:50:27 -08:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
2021-04-07 15:02:37 -07:00
|
|
|
final GridOccupancy occupancy = new GridOccupancy(mIDP.numDatabaseHotseatIcons, 1);
|
2018-10-04 15:11:00 -07:00
|
|
|
occupancy.cells[item.screenId][0] = true;
|
|
|
|
|
occupied.put(LauncherSettings.Favorites.CONTAINER_HOTSEAT, occupancy);
|
2017-01-05 21:50:27 -08:00
|
|
|
return true;
|
|
|
|
|
}
|
2018-12-07 11:43:47 -08:00
|
|
|
} else if (item.container != LauncherSettings.Favorites.CONTAINER_DESKTOP) {
|
2017-01-05 21:50:27 -08:00
|
|
|
// Skip further checking if it is not the hotseat or workspace container
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
final int countX = mIDP.numColumns;
|
|
|
|
|
final int countY = mIDP.numRows;
|
|
|
|
|
if (item.container == LauncherSettings.Favorites.CONTAINER_DESKTOP &&
|
|
|
|
|
item.cellX < 0 || item.cellY < 0 ||
|
|
|
|
|
item.cellX + item.spanX > countX || item.cellY + item.spanY > countY) {
|
|
|
|
|
Log.e(TAG, "Error loading shortcut " + item
|
|
|
|
|
+ " into cell (" + containerIndex + "-" + item.screenId + ":"
|
|
|
|
|
+ item.cellX + "," + item.cellY
|
|
|
|
|
+ ") out of screen bounds ( " + countX + "x" + countY + ")");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!occupied.containsKey(item.screenId)) {
|
|
|
|
|
GridOccupancy screen = new GridOccupancy(countX + 1, countY + 1);
|
|
|
|
|
if (item.screenId == Workspace.FIRST_SCREEN_ID) {
|
|
|
|
|
// Mark the first row as occupied (if the feature is enabled)
|
|
|
|
|
// in order to account for the QSB.
|
2020-07-24 21:13:24 -07:00
|
|
|
int spanY = FeatureFlags.EXPANDED_SMARTSPACE.get() ? 2 : 1;
|
|
|
|
|
screen.markCells(0, 0, countX + 1, spanY, FeatureFlags.QSB_ON_FIRST_SCREEN);
|
2017-01-05 21:50:27 -08:00
|
|
|
}
|
|
|
|
|
occupied.put(item.screenId, screen);
|
|
|
|
|
}
|
|
|
|
|
final GridOccupancy occupancy = occupied.get(item.screenId);
|
|
|
|
|
|
|
|
|
|
// Check if any workspace icons overlap with each other
|
|
|
|
|
if (occupancy.isRegionVacant(item.cellX, item.cellY, item.spanX, item.spanY)) {
|
|
|
|
|
occupancy.markCells(item, true);
|
|
|
|
|
return true;
|
|
|
|
|
} else {
|
|
|
|
|
Log.e(TAG, "Error loading shortcut " + item
|
|
|
|
|
+ " into cell (" + containerIndex + "-" + item.screenId + ":"
|
|
|
|
|
+ item.cellX + "," + item.cellX + "," + item.spanX + "," + item.spanY
|
|
|
|
|
+ ") already occupied");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|