Removing some obsolete features
PROMISE_APPS_NEW_INSTALLS = true ENABLE_QUICKSTEP_WIDGET_APP_START = true FOLDER_NAME_SUGGEST = true ENABLE_PREDICTION_DISMISS = true HOTSEAT_MIGRATE_TO_FOLDER = false ENABLE_DEEP_SHORTCUT_ICON_CACHE = true ENABLE_THEMED_ICONS = true ENABLE_ALL_APPS_EDU = true EXPANDED_SMARTSPACE = false Bug: 241141733 Test: Presubmit Change-Id: I72c0c20ab7e214994dc3c3665c90e85d45991a7a
This commit is contained in:
1 parent
ceb2aaa9e4
commit
c5c7da9a8b
24 files changed
+51
-278
No files matched your search
@@ -57,7 +57,6 @@ import com.android.launcher3.Utilities;
|
||||
import com.android.launcher3.Workspace;
|
||||
import com.android.launcher3.allapps.ActivityAllAppsContainerView;
|
||||
import com.android.launcher3.anim.Interpolators;
|
||||
import com.android.launcher3.config.FeatureFlags;
|
||||
import com.android.launcher3.dot.FolderDotInfo;
|
||||
import com.android.launcher3.dragndrop.BaseItemDragListener;
|
||||
import com.android.launcher3.dragndrop.DragLayer;
|
||||
@@ -418,35 +417,23 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
|
||||
if (!itemAdded) mPreviewItemManager.hidePreviewItem(index, true);
|
||||
|
||||
FolderNameInfos nameInfos = new FolderNameInfos();
|
||||
if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) {
|
||||
Executors.MODEL_EXECUTOR.post(() -> {
|
||||
d.folderNameProvider.getSuggestedFolderName(
|
||||
getContext(), mInfo.contents, nameInfos);
|
||||
showFinalView(finalIndex, item, nameInfos, d.logInstanceId);
|
||||
});
|
||||
} else {
|
||||
showFinalView(finalIndex, item, nameInfos, d.logInstanceId);
|
||||
}
|
||||
Executors.MODEL_EXECUTOR.post(() -> {
|
||||
d.folderNameProvider.getSuggestedFolderName(
|
||||
getContext(), mInfo.contents, nameInfos);
|
||||
postDelayed(() -> {
|
||||
setLabelSuggestion(nameInfos, d.logInstanceId);
|
||||
invalidate();
|
||||
}, DROP_IN_ANIMATION_DURATION);
|
||||
});
|
||||
} else {
|
||||
addItem(item);
|
||||
}
|
||||
}
|
||||
|
||||
private void showFinalView(int finalIndex, final WorkspaceItemInfo item,
|
||||
FolderNameInfos nameInfos, InstanceId instanceId) {
|
||||
postDelayed(() -> {
|
||||
setLabelSuggestion(nameInfos, instanceId);
|
||||
invalidate();
|
||||
}, DROP_IN_ANIMATION_DURATION);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the suggested folder name.
|
||||
*/
|
||||
public void setLabelSuggestion(FolderNameInfos nameInfos, InstanceId instanceId) {
|
||||
if (!FeatureFlags.FOLDER_NAME_SUGGEST.get()) {
|
||||
return;
|
||||
}
|
||||
if (!mInfo.getLabelState().equals(LabelState.UNLABELED)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user