diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIconInflater.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIconInflater.java deleted file mode 100644 index 8f1d3197cd..0000000000 --- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIconInflater.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2020 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.uioverrides; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.android.launcher3.R; -import com.android.launcher3.model.data.WorkspaceItemInfo; - -/** A util class that inflates a predicted app icon */ -public class PredictedAppIconInflater { - public static View inflate(LayoutInflater inflater, ViewGroup parent, WorkspaceItemInfo info) { - PredictedAppIcon icon = (PredictedAppIcon) inflater.inflate( - R.layout.predicted_app_icon, parent, false); - icon.applyFromWorkspaceItem(info); - return icon; - } -} diff --git a/res/layout/predicted_app_icon.xml b/res/layout/predicted_app_icon.xml new file mode 100644 index 0000000000..52df6949dd --- /dev/null +++ b/res/layout/predicted_app_icon.xml @@ -0,0 +1,17 @@ + + + + diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java index e0a66276b6..acc5bd2f79 100644 --- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java +++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java @@ -86,7 +86,6 @@ import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.pm.InstallSessionHelper; import com.android.launcher3.pm.UserCache; -import com.android.launcher3.uioverrides.PredictedAppIconInflater; import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.DisplayController; @@ -453,10 +452,10 @@ public class LauncherPreviewRenderer extends ContextWrapper private void inflateAndAddPredictedIcon(WorkspaceItemInfo info) { CellLayout screen = mWorkspaceScreens.get(info.screenId); - View view = PredictedAppIconInflater.inflate(mHomeElementInflater, screen, info); - if (view != null) { - addInScreenFromBind(view, info); - } + BubbleTextView icon = (BubbleTextView) mHomeElementInflater.inflate( + R.layout.predicted_app_icon, screen, false); + icon.applyFromWorkspaceItem(info); + addInScreenFromBind(icon, info); } private void dispatchVisibilityAggregated(View view, boolean isVisible) { diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/PredictedAppIconInflater.java b/src_ui_overrides/com/android/launcher3/uioverrides/PredictedAppIconInflater.java deleted file mode 100644 index 4893c1740e..0000000000 --- a/src_ui_overrides/com/android/launcher3/uioverrides/PredictedAppIconInflater.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2020 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.uioverrides; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.android.launcher3.model.data.WorkspaceItemInfo; - -/** A util class that inflates a predicted app icon */ -public class PredictedAppIconInflater { - public static View inflate(LayoutInflater inflater, ViewGroup parent, WorkspaceItemInfo info) { - return null; - } -}