diff --git a/Android.mk b/Android.mk index 91ecccb1e4..752b530ab0 100644 --- a/Android.mk +++ b/Android.mk @@ -149,12 +149,9 @@ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ $(call all-java-files-under, quickstep/src) \ - $(call all-java-files-under, quickstep/recents_ui_overrides/src) \ $(call all-java-files-under, src_shortcuts_overrides) -LOCAL_RESOURCE_DIR := \ - $(LOCAL_PATH)/quickstep/res \ - $(LOCAL_PATH)/quickstep/recents_ui_overrides/res +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res LOCAL_PROGUARD_ENABLED := disabled @@ -183,9 +180,7 @@ LOCAL_SYSTEM_EXT_MODULE := true LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3 -LOCAL_RESOURCE_DIR := \ - $(LOCAL_PATH)/quickstep/res \ - $(LOCAL_PATH)/quickstep/recents_ui_overrides/res +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res LOCAL_FULL_LIBS_MANIFEST_FILES := \ $(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \ @@ -220,12 +215,10 @@ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ $(call all-java-files-under, quickstep/src) \ - $(call all-java-files-under, quickstep/recents_ui_overrides/src) \ $(call all-java-files-under, go/src) LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/quickstep/res \ - $(LOCAL_PATH)/quickstep/recents_ui_overrides/res \ $(LOCAL_PATH)/go/res LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/go/res/values-v26/bools.xml b/go/res/values-v26/bools.xml deleted file mode 100644 index cc4a7ba449..0000000000 --- a/go/res/values-v26/bools.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - false - \ No newline at end of file diff --git a/go/res/values/dimens.xml b/go/res/values/dimens.xml deleted file mode 100644 index f1b1053160..0000000000 --- a/go/res/values/dimens.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - 60dp - \ No newline at end of file diff --git a/go/src/com/android/launcher3/model/LoaderResults.java b/go/src/com/android/launcher3/model/LoaderResults.java index 713053191d..5f71061a6e 100644 --- a/go/src/com/android/launcher3/model/LoaderResults.java +++ b/go/src/com/android/launcher3/model/LoaderResults.java @@ -20,7 +20,6 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import com.android.launcher3.LauncherAppState; import com.android.launcher3.model.BgDataModel.Callbacks; -import com.android.launcher3.util.LooperExecutor; /** * Helper class to handle results of {@link com.android.launcher3.model.LoaderTask}. @@ -29,12 +28,7 @@ public class LoaderResults extends BaseLoaderResults { public LoaderResults(LauncherAppState app, BgDataModel dataModel, AllAppsList allAppsList, Callbacks[] callbacks) { - this(app, dataModel, allAppsList, callbacks, MAIN_EXECUTOR); - } - - public LoaderResults(LauncherAppState app, BgDataModel dataModel, - AllAppsList allAppsList, Callbacks[] callbacks, LooperExecutor executor) { - super(app, dataModel, allAppsList, callbacks, executor); + super(app, dataModel, allAppsList, callbacks, MAIN_EXECUTOR); } @Override diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java b/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java deleted file mode 100644 index 7b8070a6e1..0000000000 --- a/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java +++ /dev/null @@ -1,317 +0,0 @@ -<<<<<<< HEAD (cc6caf Merge "Let launcher to provide its own OverscrollPlugin" int) -/* - * Copyright (C) 2018 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.icons.cache; - -import android.content.ComponentName; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.database.Cursor; -import android.database.sqlite.SQLiteException; -import android.os.SystemClock; -import android.os.UserHandle; -import android.text.TextUtils; -import android.util.ArrayMap; -import android.util.Log; -import android.util.SparseBooleanArray; - -import com.android.launcher3.icons.cache.BaseIconCache.IconDB; - -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map.Entry; -import java.util.Set; -import java.util.Stack; - -/** - * Utility class to handle updating the Icon cache - */ -public class IconCacheUpdateHandler { - - private static final String TAG = "IconCacheUpdateHandler"; - - /** - * In this mode, all invalid icons are marked as to-be-deleted in {@link #mItemsToDelete}. - * This mode is used for the first run. - */ - private static final boolean MODE_SET_INVALID_ITEMS = true; - - /** - * In this mode, any valid icon is removed from {@link #mItemsToDelete}. This is used for all - * subsequent runs, which essentially acts as set-union of all valid items. - */ - private static final boolean MODE_CLEAR_VALID_ITEMS = false; - - private static final Object ICON_UPDATE_TOKEN = new Object(); - - private final HashMap mPkgInfoMap; - private final BaseIconCache mIconCache; - - private final ArrayMap> mPackagesToIgnore = new ArrayMap<>(); - - private final SparseBooleanArray mItemsToDelete = new SparseBooleanArray(); - private boolean mFilterMode = MODE_SET_INVALID_ITEMS; - - IconCacheUpdateHandler(BaseIconCache cache) { - mIconCache = cache; - - mPkgInfoMap = new HashMap<>(); - - // Remove all active icon update tasks. - mIconCache.mWorkerHandler.removeCallbacksAndMessages(ICON_UPDATE_TOKEN); - - createPackageInfoMap(); - } - - /** - * Sets a package to ignore for processing - */ - public void addPackagesToIgnore(UserHandle userHandle, String packageName) { - Set packages = mPackagesToIgnore.get(userHandle); - if (packages == null) { - packages = new HashSet<>(); - mPackagesToIgnore.put(userHandle, packages); - } - packages.add(packageName); - } - - private void createPackageInfoMap() { - PackageManager pm = mIconCache.mPackageManager; - for (PackageInfo info : - pm.getInstalledPackages(PackageManager.MATCH_UNINSTALLED_PACKAGES)) { - mPkgInfoMap.put(info.packageName, info); - } - } - - /** - * Updates the persistent DB, such that only entries corresponding to {@param apps} remain in - * the DB and are updated. - * @return The set of packages for which icons have updated. - */ - public void updateIcons(List apps, CachingLogic cachingLogic, - OnUpdateCallback onUpdateCallback) { - // Filter the list per user - HashMap> userComponentMap = new HashMap<>(); - int count = apps.size(); - for (int i = 0; i < count; i++) { - T app = apps.get(i); - UserHandle userHandle = cachingLogic.getUser(app); - HashMap componentMap = userComponentMap.get(userHandle); - if (componentMap == null) { - componentMap = new HashMap<>(); - userComponentMap.put(userHandle, componentMap); - } - componentMap.put(cachingLogic.getComponent(app), app); - } - - for (Entry> entry : userComponentMap.entrySet()) { - updateIconsPerUser(entry.getKey(), entry.getValue(), cachingLogic, onUpdateCallback); - } - - // From now on, clear every valid item from the global valid map. - mFilterMode = MODE_CLEAR_VALID_ITEMS; - } - - /** - * Updates the persistent DB, such that only entries corresponding to {@param apps} remain in - * the DB and are updated. - * @return The set of packages for which icons have updated. - */ - @SuppressWarnings("unchecked") - private void updateIconsPerUser(UserHandle user, HashMap componentMap, - CachingLogic cachingLogic, OnUpdateCallback onUpdateCallback) { - Set ignorePackages = mPackagesToIgnore.get(user); - if (ignorePackages == null) { - ignorePackages = Collections.emptySet(); - } - long userSerial = mIconCache.getSerialNumberForUser(user); - - Stack appsToUpdate = new Stack<>(); - - try (Cursor c = mIconCache.mIconDb.query( - new String[]{IconDB.COLUMN_ROWID, IconDB.COLUMN_COMPONENT, - IconDB.COLUMN_LAST_UPDATED, IconDB.COLUMN_VERSION, - IconDB.COLUMN_SYSTEM_STATE}, - IconDB.COLUMN_USER + " = ? ", - new String[]{Long.toString(userSerial)})) { - - final int indexComponent = c.getColumnIndex(IconDB.COLUMN_COMPONENT); - final int indexLastUpdate = c.getColumnIndex(IconDB.COLUMN_LAST_UPDATED); - final int indexVersion = c.getColumnIndex(IconDB.COLUMN_VERSION); - final int rowIndex = c.getColumnIndex(IconDB.COLUMN_ROWID); - final int systemStateIndex = c.getColumnIndex(IconDB.COLUMN_SYSTEM_STATE); - - while (c.moveToNext()) { - String cn = c.getString(indexComponent); - ComponentName component = ComponentName.unflattenFromString(cn); - PackageInfo info = mPkgInfoMap.get(component.getPackageName()); - - int rowId = c.getInt(rowIndex); - if (info == null) { - if (!ignorePackages.contains(component.getPackageName())) { - - if (mFilterMode == MODE_SET_INVALID_ITEMS) { - mIconCache.remove(component, user); - mItemsToDelete.put(rowId, true); - } - } - continue; - } - if ((info.applicationInfo.flags & ApplicationInfo.FLAG_IS_DATA_ONLY) != 0) { - // Application is not present - continue; - } - - long updateTime = c.getLong(indexLastUpdate); - int version = c.getInt(indexVersion); - T app = componentMap.remove(component); - if (version == info.versionCode - && updateTime == cachingLogic.getLastUpdatedTime(app, info) - && TextUtils.equals(c.getString(systemStateIndex), - mIconCache.getIconSystemState(info.packageName))) { - - if (mFilterMode == MODE_CLEAR_VALID_ITEMS) { - mItemsToDelete.put(rowId, false); - } - continue; - } - - if (app == null) { - if (mFilterMode == MODE_SET_INVALID_ITEMS) { - mIconCache.remove(component, user); - mItemsToDelete.put(rowId, true); - } - } else { - appsToUpdate.add(app); - } - } - } catch (SQLiteException e) { - Log.d(TAG, "Error reading icon cache", e); - // Continue updating whatever we have read so far - } - - // Insert remaining apps. - if (!componentMap.isEmpty() || !appsToUpdate.isEmpty()) { - Stack appsToAdd = new Stack<>(); - appsToAdd.addAll(componentMap.values()); - new SerializedIconUpdateTask(userSerial, user, appsToAdd, appsToUpdate, cachingLogic, - onUpdateCallback).scheduleNext(); - } - } - - /** - * Commits all updates as part of the update handler to disk. Not more calls should be made - * to this class after this. - */ - public void finish() { - // Commit all deletes - int deleteCount = 0; - StringBuilder queryBuilder = new StringBuilder() - .append(IconDB.COLUMN_ROWID) - .append(" IN ("); - - int count = mItemsToDelete.size(); - for (int i = 0; i < count; i++) { - if (mItemsToDelete.valueAt(i)) { - if (deleteCount > 0) { - queryBuilder.append(", "); - } - queryBuilder.append(mItemsToDelete.keyAt(i)); - deleteCount++; - } - } - queryBuilder.append(')'); - - if (deleteCount > 0) { - mIconCache.mIconDb.delete(queryBuilder.toString(), null); - } - } - - /** - * A runnable that updates invalid icons and adds missing icons in the DB for the provided - * LauncherActivityInfo list. Items are updated/added one at a time, so that the - * worker thread doesn't get blocked. - */ - private class SerializedIconUpdateTask implements Runnable { - private final long mUserSerial; - private final UserHandle mUserHandle; - private final Stack mAppsToAdd; - private final Stack mAppsToUpdate; - private final CachingLogic mCachingLogic; - private final HashSet mUpdatedPackages = new HashSet<>(); - private final OnUpdateCallback mOnUpdateCallback; - - SerializedIconUpdateTask(long userSerial, UserHandle userHandle, - Stack appsToAdd, Stack appsToUpdate, CachingLogic cachingLogic, - OnUpdateCallback onUpdateCallback) { - mUserHandle = userHandle; - mUserSerial = userSerial; - mAppsToAdd = appsToAdd; - mAppsToUpdate = appsToUpdate; - mCachingLogic = cachingLogic; - mOnUpdateCallback = onUpdateCallback; - } - - @Override - public void run() { - if (!mAppsToUpdate.isEmpty()) { - T app = mAppsToUpdate.pop(); - String pkg = mCachingLogic.getComponent(app).getPackageName(); - PackageInfo info = mPkgInfoMap.get(pkg); - - mIconCache.addIconToDBAndMemCache( - app, mCachingLogic, info, mUserSerial, true /*replace existing*/); - mUpdatedPackages.add(pkg); - - if (mAppsToUpdate.isEmpty() && !mUpdatedPackages.isEmpty()) { - // No more app to update. Notify callback. - mOnUpdateCallback.onPackageIconsUpdated(mUpdatedPackages, mUserHandle); - } - - // Let it run one more time. - scheduleNext(); - } else if (!mAppsToAdd.isEmpty()) { - T app = mAppsToAdd.pop(); - PackageInfo info = mPkgInfoMap.get(mCachingLogic.getComponent(app).getPackageName()); - // We do not check the mPkgInfoMap when generating the mAppsToAdd. Although every - // app should have package info, this is not guaranteed by the api - if (info != null) { - mIconCache.addIconToDBAndMemCache(app, mCachingLogic, info, - mUserSerial, false /*replace existing*/); - } - - if (!mAppsToAdd.isEmpty()) { - scheduleNext(); - } - } - } - - public void scheduleNext() { - mIconCache.mWorkerHandler.postAtTime(this, ICON_UPDATE_TOKEN, - SystemClock.uptimeMillis() + 1); - } - } - - public interface OnUpdateCallback { - - void onPackageIconsUpdated(HashSet updatedPackages, UserHandle user); - } -} -======= ->>>>>>> CHANGE (805b52 Removes iconloaderlib from Launcher3.) diff --git a/quickstep/recents_ui_overrides/res/values/colors.xml b/quickstep/recents_ui_overrides/res/values/colors.xml deleted file mode 100644 index f03f118f38..0000000000 --- a/quickstep/recents_ui_overrides/res/values/colors.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - #fff - #39000000 - - #61000000 - #61FFFFFF - #3c000000 - #3cffffff - \ No newline at end of file diff --git a/quickstep/recents_ui_overrides/res/values/config.xml b/quickstep/recents_ui_overrides/res/values/config.xml deleted file mode 100644 index 120e03456f..0000000000 --- a/quickstep/recents_ui_overrides/res/values/config.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - 150 - \ No newline at end of file diff --git a/quickstep/recents_ui_overrides/res/values/dimens.xml b/quickstep/recents_ui_overrides/res/values/dimens.xml deleted file mode 100644 index 9266b0652b..0000000000 --- a/quickstep/recents_ui_overrides/res/values/dimens.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - 1dp - 20dp - 20dp - 10dp - 12dp - 20dp - 16dp - 2dp - 16dp - 26dp - 4dp - 10dp - 14sp - - 17dp - 16dp - 8dp - 14sp - - - 80dp - \ No newline at end of file diff --git a/quickstep/recents_ui_overrides/src/REMOVED.txt b/quickstep/recents_ui_overrides/src/REMOVED.txt new file mode 100644 index 0000000000..c3a3eaf692 --- /dev/null +++ b/quickstep/recents_ui_overrides/src/REMOVED.txt @@ -0,0 +1,2 @@ +Temp file to prevent build breakage. +Will be removed in followup cl. \ No newline at end of file diff --git a/quickstep/recents_ui_overrides/res/drawable/all_apps_edu_circle.xml b/quickstep/res/drawable/all_apps_edu_circle.xml similarity index 100% rename from quickstep/recents_ui_overrides/res/drawable/all_apps_edu_circle.xml rename to quickstep/res/drawable/all_apps_edu_circle.xml diff --git a/quickstep/recents_ui_overrides/res/drawable/chip_hint_background_light.xml b/quickstep/res/drawable/chip_hint_background_light.xml similarity index 100% rename from quickstep/recents_ui_overrides/res/drawable/chip_hint_background_light.xml rename to quickstep/res/drawable/chip_hint_background_light.xml diff --git a/quickstep/recents_ui_overrides/res/drawable/chip_scrim_gradient.xml b/quickstep/res/drawable/chip_scrim_gradient.xml similarity index 100% rename from quickstep/recents_ui_overrides/res/drawable/chip_scrim_gradient.xml rename to quickstep/res/drawable/chip_scrim_gradient.xml diff --git a/quickstep/recents_ui_overrides/res/drawable/hotseat_edu_notification_icon.xml b/quickstep/res/drawable/hotseat_edu_notification_icon.xml similarity index 100% rename from quickstep/recents_ui_overrides/res/drawable/hotseat_edu_notification_icon.xml rename to quickstep/res/drawable/hotseat_edu_notification_icon.xml diff --git a/quickstep/recents_ui_overrides/res/layout/all_apps_edu_view.xml b/quickstep/res/layout/all_apps_edu_view.xml similarity index 100% rename from quickstep/recents_ui_overrides/res/layout/all_apps_edu_view.xml rename to quickstep/res/layout/all_apps_edu_view.xml diff --git a/quickstep/recents_ui_overrides/res/layout/fallback_recents_activity.xml b/quickstep/res/layout/fallback_recents_activity.xml similarity index 100% rename from quickstep/recents_ui_overrides/res/layout/fallback_recents_activity.xml rename to quickstep/res/layout/fallback_recents_activity.xml diff --git a/quickstep/recents_ui_overrides/res/layout/floating_header_content.xml b/quickstep/res/layout/floating_header_content.xml similarity index 100% rename from quickstep/recents_ui_overrides/res/layout/floating_header_content.xml rename to quickstep/res/layout/floating_header_content.xml diff --git a/quickstep/recents_ui_overrides/res/layout/overview_panel.xml b/quickstep/res/layout/overview_panel.xml similarity index 100% rename from quickstep/recents_ui_overrides/res/layout/overview_panel.xml rename to quickstep/res/layout/overview_panel.xml diff --git a/quickstep/recents_ui_overrides/res/layout/predicted_app_icon.xml b/quickstep/res/layout/predicted_app_icon.xml similarity index 100% rename from quickstep/recents_ui_overrides/res/layout/predicted_app_icon.xml rename to quickstep/res/layout/predicted_app_icon.xml diff --git a/quickstep/recents_ui_overrides/res/layout/predicted_hotseat_edu.xml b/quickstep/res/layout/predicted_hotseat_edu.xml similarity index 100% rename from quickstep/recents_ui_overrides/res/layout/predicted_hotseat_edu.xml rename to quickstep/res/layout/predicted_hotseat_edu.xml diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml index 40da136ff0..449fe108ef 100644 --- a/quickstep/res/values/colors.xml +++ b/quickstep/res/values/colors.xml @@ -16,4 +16,12 @@ #FFFFFFFF #99000000 + + #fff + #39000000 + + #61000000 + #61FFFFFF + #3c000000 + #3cffffff \ No newline at end of file diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml index a57112bf66..9ec303a48c 100644 --- a/quickstep/res/values/config.xml +++ b/quickstep/res/values/config.xml @@ -37,4 +37,6 @@ 20 + + 150 diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 6737c5f61d..f9f1051672 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -102,4 +102,26 @@ 64dp 80dp 184dp + + 1dp + 20dp + 20dp + 10dp + 12dp + 20dp + 16dp + 2dp + 16dp + 26dp + 4dp + 10dp + 14sp + + 17dp + 16dp + 8dp + 14sp + + + 80dp diff --git a/quickstep/recents_ui_overrides/res/values/override.xml b/quickstep/res/values/override.xml similarity index 99% rename from quickstep/recents_ui_overrides/res/values/override.xml rename to quickstep/res/values/override.xml index 1937164b7d..397ea82489 100644 --- a/quickstep/recents_ui_overrides/res/values/override.xml +++ b/quickstep/res/values/override.xml @@ -32,4 +32,3 @@ com.android.launcher3.model.QuickstepModelDelegate - diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java rename to quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AllAppsTipView.java b/quickstep/src/com/android/launcher3/appprediction/AllAppsTipView.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AllAppsTipView.java rename to quickstep/src/com/android/launcher3/appprediction/AllAppsTipView.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java rename to quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/ComponentKeyMapper.java b/quickstep/src/com/android/launcher3/appprediction/ComponentKeyMapper.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/ComponentKeyMapper.java rename to quickstep/src/com/android/launcher3/appprediction/ComponentKeyMapper.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/DynamicItemCache.java b/quickstep/src/com/android/launcher3/appprediction/DynamicItemCache.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/DynamicItemCache.java rename to quickstep/src/com/android/launcher3/appprediction/DynamicItemCache.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/InstantAppItemInfo.java b/quickstep/src/com/android/launcher3/appprediction/InstantAppItemInfo.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/InstantAppItemInfo.java rename to quickstep/src/com/android/launcher3/appprediction/InstantAppItemInfo.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java rename to quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java similarity index 99% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java index 4f95254a72..8ebf1251ec 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java +++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java @@ -284,4 +284,3 @@ public class HotseatEduController { return new Intent(SETTINGS_ACTION).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); } } - diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/model/AppEventProducer.java b/quickstep/src/com/android/launcher3/model/AppEventProducer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/model/AppEventProducer.java rename to quickstep/src/com/android/launcher3/model/AppEventProducer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/model/PredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/model/PredictionUpdateTask.java rename to quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/model/QuickstepModelDelegate.java rename to quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/PredictedAppIcon.java rename to quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/PredictedAppIconInflater.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIconInflater.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/PredictedAppIconInflater.java rename to quickstep/src/com/android/launcher3/uioverrides/PredictedAppIconInflater.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java rename to quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java rename to quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java rename to quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java rename to quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java rename to quickstep/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java rename to quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java rename to quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java rename to quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java rename to quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java b/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java rename to quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java rename to quickstep/src/com/android/quickstep/FallbackActivityInterface.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java rename to quickstep/src/com/android/quickstep/FallbackSwipeHandler.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/ImageActionsApi.java b/quickstep/src/com/android/quickstep/ImageActionsApi.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/ImageActionsApi.java rename to quickstep/src/com/android/quickstep/ImageActionsApi.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java rename to quickstep/src/com/android/quickstep/LauncherActivityInterface.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandlerV2.java rename to quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/OverscrollPluginFactory.java b/quickstep/src/com/android/quickstep/OverscrollPluginFactory.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/OverscrollPluginFactory.java rename to quickstep/src/com/android/quickstep/OverscrollPluginFactory.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewCommandHelper.java rename to quickstep/src/com/android/quickstep/OverviewCommandHelper.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java rename to quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsActivity.java rename to quickstep/src/com/android/quickstep/RecentsActivity.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java rename to quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java rename to quickstep/src/com/android/quickstep/TaskOverlayFactory.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/TaskShortcutFactory.java rename to quickstep/src/com/android/quickstep/TaskShortcutFactory.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java rename to quickstep/src/com/android/quickstep/TaskViewUtils.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java rename to quickstep/src/com/android/quickstep/TouchInteractionService.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/ViewUtils.java b/quickstep/src/com/android/quickstep/ViewUtils.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/ViewUtils.java rename to quickstep/src/com/android/quickstep/ViewUtils.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java b/quickstep/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java rename to quickstep/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsStateController.java rename to quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java rename to quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsDragLayer.java b/quickstep/src/com/android/quickstep/fallback/RecentsDragLayer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsDragLayer.java rename to quickstep/src/com/android/quickstep/fallback/RecentsDragLayer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsState.java rename to quickstep/src/com/android/quickstep/fallback/RecentsState.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsTaskController.java b/quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsTaskController.java rename to quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java rename to quickstep/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java rename to quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java rename to quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java rename to quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java rename to quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java rename to quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverscrollInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverscrollInputConsumer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverscrollInputConsumer.java rename to quickstep/src/com/android/quickstep/inputconsumers/OverscrollInputConsumer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java rename to quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java rename to quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.java rename to quickstep/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java rename to quickstep/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java rename to quickstep/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ActiveGestureLog.java b/quickstep/src/com/android/quickstep/util/ActiveGestureLog.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/ActiveGestureLog.java rename to quickstep/src/com/android/quickstep/util/ActiveGestureLog.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/AssistantUtilities.java b/quickstep/src/com/android/quickstep/util/AssistantUtilities.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/AssistantUtilities.java rename to quickstep/src/com/android/quickstep/util/AssistantUtilities.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/InputConsumerProxy.java b/quickstep/src/com/android/quickstep/util/InputConsumerProxy.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/InputConsumerProxy.java rename to quickstep/src/com/android/quickstep/util/InputConsumerProxy.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java rename to quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ProtoTracer.java b/quickstep/src/com/android/quickstep/util/ProtoTracer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/ProtoTracer.java rename to quickstep/src/com/android/quickstep/util/ProtoTracer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java b/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java rename to quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RectFSpringAnim.java b/quickstep/src/com/android/quickstep/util/RectFSpringAnim.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/RectFSpringAnim.java rename to quickstep/src/com/android/quickstep/util/RectFSpringAnim.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ShelfPeekAnim.java b/quickstep/src/com/android/quickstep/util/ShelfPeekAnim.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/ShelfPeekAnim.java rename to quickstep/src/com/android/quickstep/util/ShelfPeekAnim.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java rename to quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/SurfaceTransactionApplier.java b/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/SurfaceTransactionApplier.java rename to quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskCornerRadius.java b/quickstep/src/com/android/quickstep/util/TaskCornerRadius.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskCornerRadius.java rename to quickstep/src/com/android/quickstep/util/TaskCornerRadius.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java rename to quickstep/src/com/android/quickstep/util/TaskViewSimulator.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TransformParams.java b/quickstep/src/com/android/quickstep/util/TransformParams.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/TransformParams.java rename to quickstep/src/com/android/quickstep/util/TransformParams.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java b/quickstep/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java rename to quickstep/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/AllAppsEduView.java b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/AllAppsEduView.java rename to quickstep/src/com/android/quickstep/views/AllAppsEduView.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java rename to quickstep/src/com/android/quickstep/views/ClearAllButton.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java rename to quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/IconView.java b/quickstep/src/com/android/quickstep/views/IconView.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/IconView.java rename to quickstep/src/com/android/quickstep/views/IconView.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java rename to quickstep/src/com/android/quickstep/views/LauncherRecentsView.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LiveTileOverlay.java b/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/LiveTileOverlay.java rename to quickstep/src/com/android/quickstep/views/LiveTileOverlay.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java rename to quickstep/src/com/android/quickstep/views/OverviewActionsView.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsExtraViewContainer.java b/quickstep/src/com/android/quickstep/views/RecentsExtraViewContainer.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsExtraViewContainer.java rename to quickstep/src/com/android/quickstep/views/RecentsExtraViewContainer.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java rename to quickstep/src/com/android/quickstep/views/RecentsView.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java rename to quickstep/src/com/android/quickstep/views/TaskMenuView.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java rename to quickstep/src/com/android/quickstep/views/TaskThumbnailView.java diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java rename to quickstep/src/com/android/quickstep/views/TaskView.java diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index e2568d5ef6..f58e0b496a 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -60,7 +60,6 @@ import com.android.launcher3.pm.UserCache; import com.android.launcher3.shortcuts.ShortcutRequest; import com.android.launcher3.util.IntSet; import com.android.launcher3.util.ItemInfoMatcher; -import com.android.launcher3.util.LooperExecutor; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.Preconditions; @@ -85,7 +84,6 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi private final LauncherAppState mApp; private final Object mLock = new Object(); - private final LooperExecutor mMainExecutor = MAIN_EXECUTOR; private LoaderTask mLoaderTask; private boolean mIsLoaderTaskRunning; @@ -337,13 +335,13 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi if (callbacksList.length > 0) { // Clear any pending bind-runnables from the synchronized load process. for (Callbacks cb : callbacksList) { - mMainExecutor.execute(cb::clearPendingBinds); + MAIN_EXECUTOR.execute(cb::clearPendingBinds); } // If there is already one running, tell it to stop. stopLoader(); LoaderResults loaderResults = new LoaderResults( - mApp, mBgDataModel, mBgAllAppsList, callbacksList, mMainExecutor); + mApp, mBgDataModel, mBgAllAppsList, callbacksList); if (mModelLoaded && !mIsLoaderTaskRunning) { // Divide the set of loaded items into those that we are binding synchronously, // and everything else that is to be bound normally (asynchronously). @@ -530,7 +528,7 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi } public void enqueueModelUpdateTask(ModelUpdateTask task) { - task.init(mApp, this, mBgDataModel, mBgAllAppsList, mMainExecutor); + task.init(mApp, this, mBgDataModel, mBgAllAppsList, MAIN_EXECUTOR); MODEL_EXECUTOR.execute(task); } diff --git a/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java b/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java index dcb4636bfc..269af7bcc5 100644 --- a/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java +++ b/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java @@ -21,7 +21,6 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import com.android.launcher3.LauncherAppState; import com.android.launcher3.model.BgDataModel.Callbacks; import com.android.launcher3.util.ComponentKey; -import com.android.launcher3.util.LooperExecutor; import com.android.launcher3.widget.WidgetListRowEntry; import java.util.ArrayList; @@ -34,12 +33,7 @@ public class LoaderResults extends BaseLoaderResults { public LoaderResults(LauncherAppState app, BgDataModel dataModel, AllAppsList allAppsList, Callbacks[] callbacks) { - this(app, dataModel, allAppsList, callbacks, MAIN_EXECUTOR); - } - - public LoaderResults(LauncherAppState app, BgDataModel dataModel, - AllAppsList allAppsList, Callbacks[] callbacks, LooperExecutor executor) { - super(app, dataModel, allAppsList, callbacks, executor); + super(app, dataModel, allAppsList, callbacks, MAIN_EXECUTOR); } @Override