openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Updating predictions if hotseat items get removed/added as a result of model callback" into sc-dev

This commit is contained in:
Sunny Goyal 2021-02-04 21:36:45 +00:00 committed by Android (Google) Code Review
parent ed8473357d b245c552d4
commit d028812c9e
3 changed files with 74 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
View File

@ -355,10 +355,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
// populating workspace.
// TODO: Find a better place for this
WellbeingModel.INSTANCE.get(this);
if (mTaskbarController != null) {
mTaskbarController.onHotseatUpdated();
}
}
@Override

90
quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
View File

@ -20,6 +20,7 @@ import static com.android.launcher3.LauncherState.NORMAL;
import static com.android.launcher3.hybridhotseat.HotseatEduController.getSettingsIntent;
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_PREDICTION_PINNED;
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_RANKED;
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
import android.animation.Animator;
import android.animation.AnimatorSet;
@ -70,7 +71,11 @@ import java.util.stream.Collectors;
*/
public class HotseatPredictionController implements DragController.DragListener,
SystemShortcut.Factory<QuickstepLauncher>, InvariantDeviceProfile.OnIDPChangeListener,
DragSource {
DragSource, ViewGroup.OnHierarchyChangeListener {
private static final int FLAG_UPDATE_PAUSED = 1 << 0;
private static final int FLAG_DRAG_IN_PROGRESS = 1 << 1;
private static final int FLAG_FILL_IN_PROGRESS = 1 << 2;
private int mHotSeatItemsCount;
@ -80,8 +85,7 @@ public class HotseatPredictionController implements DragController.DragListener,
private List<ItemInfo> mPredictedItems = Collections.emptyList();
private AnimatorSet mIconRemoveAnimators;
private boolean mUIUpdatePaused = false;
private boolean mDragInProgress = false;
private int mPauseFlags = 0;
private List<PredictedAppIcon.PredictedIconOutlineDrawing> mOutlineDrawings = new ArrayList<>();
@ -114,6 +118,30 @@ public class HotseatPredictionController implements DragController.DragListener,
mLauncher.getDragController().addDragListener(this);
launcher.getDeviceProfile().inv.addOnChangeListener(this);
mHotseat.getShortcutsAndWidgets().setOnHierarchyChangeListener(this);
}
@Override
public void onChildViewAdded(View parent, View child) {
onHotseatHierarchyChanged();
}
@Override
public void onChildViewRemoved(View parent, View child) {
onHotseatHierarchyChanged();
}
private void onHotseatHierarchyChanged() {
if (mPauseFlags == 0 && !mLauncher.isWorkspaceLoading()) {
// Post update after a single frame to avoid layout within layout
MAIN_EXECUTOR.getHandler().post(this::updateFillIfNotLoading);
}
}
private void updateFillIfNotLoading() {
if (mPauseFlags == 0 && !mLauncher.isWorkspaceLoading()) {
fillGapsWithPrediction(true);
}
}
/**
@ -160,11 +188,11 @@ public class HotseatPredictionController implements DragController.DragListener,
}
private void fillGapsWithPrediction() {
fillGapsWithPrediction(false, null);
fillGapsWithPrediction(false);
}
private void fillGapsWithPrediction(boolean animate, Runnable callback) {
if (mUIUpdatePaused || mDragInProgress) {
private void fillGapsWithPrediction(boolean animate) {
if (mPauseFlags != 0) {
return;
}
@ -175,12 +203,14 @@ public class HotseatPredictionController implements DragController.DragListener,
mIconRemoveAnimators.addListener(new AnimationSuccessListener() {
@Override
public void onAnimationSuccess(Animator animator) {
fillGapsWithPrediction(animate, callback);
fillGapsWithPrediction(animate);
mIconRemoveAnimators.removeListener(this);
}
});
return;
}
mPauseFlags |= FLAG_FILL_IN_PROGRESS;
for (int rank = 0; rank < mHotSeatItemsCount; rank++) {
View child = mHotseat.getChildAt(
mHotseat.getCellXFromOrder(rank),
@ -207,10 +237,12 @@ public class HotseatPredictionController implements DragController.DragListener,
}
preparePredictionInfo(predictedItem, rank);
}
bindItems(newItems, animate, callback);
bindItems(newItems, animate);
mPauseFlags &= ~FLAG_FILL_IN_PROGRESS;
}
private void bindItems(List<WorkspaceItemInfo> itemsToAdd, boolean animate, Runnable callback) {
private void bindItems(List<WorkspaceItemInfo> itemsToAdd, boolean animate) {
AnimatorSet animationSet = new AnimatorSet();
for (WorkspaceItemInfo item : itemsToAdd) {
PredictedAppIcon icon = PredictedAppIcon.createIcon(mHotseat, item);
@ -221,12 +253,11 @@ public class HotseatPredictionController implements DragController.DragListener,
}
}
if (animate) {
if (callback != null) {
animationSet.addListener(AnimationSuccessListener.forRunnable(callback));
}
animationSet.addListener(AnimationSuccessListener
.forRunnable(this::removeOutlineDrawings));
animationSet.start();
} else {
if (callback != null) callback.run();
removeOutlineDrawings();
}
if (mLauncher.getTaskbarController() != null) {
@ -234,6 +265,16 @@ public class HotseatPredictionController implements DragController.DragListener,
}
}
private void removeOutlineDrawings() {
if (mOutlineDrawings.isEmpty()) return;
for (PredictedAppIcon.PredictedIconOutlineDrawing outlineDrawing : mOutlineDrawings) {
mHotseat.removeDelegatedCellDrawing(outlineDrawing);
}
mHotseat.invalidate();
mOutlineDrawings.clear();
}
/**
* Unregisters callbacks and frees resources
*/
@ -245,11 +286,9 @@ public class HotseatPredictionController implements DragController.DragListener,
* start and pauses predicted apps update on the hotseat
*/
public void setPauseUIUpdate(boolean paused) {
if (mLauncher.getTaskbarController() != null) {
// Taskbar is present, always allow updates since hotseat is still visible.
return;
}
mUIUpdatePaused = paused;
mPauseFlags = paused
? (mPauseFlags | FLAG_UPDATE_PAUSED)
: (mPauseFlags & ~FLAG_UPDATE_PAUSED);
if (!paused) {
fillGapsWithPrediction();
}
@ -365,14 +404,14 @@ public class HotseatPredictionController implements DragController.DragListener,
for (PredictedAppIcon.PredictedIconOutlineDrawing outlineDrawing : mOutlineDrawings) {
mHotseat.addDelegatedCellDrawing(outlineDrawing);
}
mDragInProgress = true;
mPauseFlags |= FLAG_DRAG_IN_PROGRESS;
mHotseat.invalidate();
}
@Override
public void onDragEnd() {
mDragInProgress = false;
fillGapsWithPrediction(true, this::removeOutlineDrawings);
mPauseFlags &= ~FLAG_DRAG_IN_PROGRESS;
fillGapsWithPrediction(true);
}
@Nullable
@ -393,15 +432,6 @@ public class HotseatPredictionController implements DragController.DragListener,
itemInfo.screenId = rank;
}
private void removeOutlineDrawings() {
if (mOutlineDrawings.isEmpty()) return;
for (PredictedAppIcon.PredictedIconOutlineDrawing outlineDrawing : mOutlineDrawings) {
mHotseat.removeDelegatedCellDrawing(outlineDrawing);
}
mHotseat.invalidate();
mOutlineDrawings.clear();
}
@Override
public void onIdpChanged(int changeFlags, InvariantDeviceProfile profile) {
this.mHotSeatItemsCount = profile.numHotseatIcons;

15
quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
View File

@ -17,6 +17,7 @@ package com.android.launcher3.uioverrides;
import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED;
import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT;
import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
@ -54,6 +55,7 @@ import com.android.launcher3.logging.InstanceId;
import com.android.launcher3.logging.StatsLogManager.StatsLogger;
import com.android.launcher3.model.BgDataModel.FixedContainerItems;
import com.android.launcher3.model.data.ItemInfo;
import com.android.launcher3.model.data.WorkspaceItemInfo;
import com.android.launcher3.popup.SystemShortcut;
import com.android.launcher3.search.DeviceSearchAdapterProvider;
import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
@ -82,6 +84,7 @@ import com.android.quickstep.views.TaskView;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Stream;
@ -164,7 +167,8 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
@Override
public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
if (mHotseatPredictionController != null) {
mHotseatPredictionController.setPauseUIUpdate(true);
// Only pause is taskbar controller is not present
mHotseatPredictionController.setPauseUIUpdate(getTaskbarController() == null);
}
return super.startActivitySafely(v, intent, item);
}
@ -229,6 +233,15 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
}
}
@Override
public void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated) {
super.bindWorkspaceItemsChanged(updated);
if (getTaskbarController() != null && updated.stream()
.filter(w -> w.container == CONTAINER_HOTSEAT).findFirst().isPresent()) {
getTaskbarController().onHotseatUpdated();
}
}
@Override
public void onDestroy() {
super.onDestroy();