This prevents a conflict between the scroll animation and layout transition caused by removing the screen. Since the extra screen is at the end of the workspace, this most commonly (only?) causes issues in RTL, as everything shifts to the left to fill the void of the empty screen. See bug for example video of the issue. With this change, the removal of the empty screen happens after Launcher finishes transitioning back to NORMAL state after dropping an icon/widget, rather than in onDragEnd. Note: There is a similar issue when placing a widget in RTL (even if not switching screens), but it's not made worse by this CL. Filed b/166531479. Demo: https://drive.google.com/file/d/1JTP81syjoBFe3_N2SOZHP5r5_RoCUWan/view?usp=sharing Fixes: 163382092 Change-Id: I55ed5af8e1d80dcc0d1b6502c3c5b068dc6f8722
145 lines
5.6 KiB
Java
145 lines
5.6 KiB
Java
/*
|
|
* 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;
|
|
|
|
import android.util.Log;
|
|
import android.view.View;
|
|
import android.view.ViewGroup;
|
|
|
|
import com.android.launcher3.folder.Folder;
|
|
import com.android.launcher3.folder.FolderIcon;
|
|
import com.android.launcher3.model.data.ItemInfo;
|
|
import com.android.launcher3.touch.ItemLongClickListener;
|
|
|
|
public interface WorkspaceLayoutManager {
|
|
|
|
String TAG = "Launcher.Workspace";
|
|
|
|
// The screen id used for the empty screen always present at the end.
|
|
int EXTRA_EMPTY_SCREEN_ID = -201;
|
|
// The is the first screen. It is always present, even if its empty.
|
|
int FIRST_SCREEN_ID = 0;
|
|
|
|
/**
|
|
* At bind time, we use the rank (screenId) to compute x and y for hotseat items.
|
|
* See {@link #addInScreen}.
|
|
*/
|
|
default void addInScreenFromBind(View child, ItemInfo info) {
|
|
int x = info.cellX;
|
|
int y = info.cellY;
|
|
if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT
|
|
|| info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION) {
|
|
int screenId = info.screenId;
|
|
x = getHotseat().getCellXFromOrder(screenId);
|
|
y = getHotseat().getCellYFromOrder(screenId);
|
|
}
|
|
addInScreen(child, info.container, info.screenId, x, y, info.spanX, info.spanY);
|
|
}
|
|
|
|
/**
|
|
* Adds the specified child in the specified screen based on the {@param info}
|
|
* See {@link #addInScreen(View, int, int, int, int, int, int)}.
|
|
*/
|
|
default void addInScreen(View child, ItemInfo info) {
|
|
addInScreen(child, info.container, info.screenId, info.cellX, info.cellY,
|
|
info.spanX, info.spanY);
|
|
}
|
|
|
|
/**
|
|
* Adds the specified child in the specified screen. The position and dimension of
|
|
* the child are defined by x, y, spanX and spanY.
|
|
*
|
|
* @param child The child to add in one of the workspace's screens.
|
|
* @param screenId The screen in which to add the child.
|
|
* @param x The X position of the child in the screen's grid.
|
|
* @param y The Y position of the child in the screen's grid.
|
|
* @param spanX The number of cells spanned horizontally by the child.
|
|
* @param spanY The number of cells spanned vertically by the child.
|
|
*/
|
|
default void addInScreen(View child, int container, int screenId, int x, int y,
|
|
int spanX, int spanY) {
|
|
if (container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {
|
|
if (getScreenWithId(screenId) == null) {
|
|
Log.e(TAG, "Skipping child, screenId " + screenId + " not found");
|
|
// DEBUGGING - Print out the stack trace to see where we are adding from
|
|
new Throwable().printStackTrace();
|
|
return;
|
|
}
|
|
}
|
|
if (screenId == EXTRA_EMPTY_SCREEN_ID) {
|
|
// This should never happen
|
|
throw new RuntimeException("Screen id should not be EXTRA_EMPTY_SCREEN_ID");
|
|
}
|
|
|
|
final CellLayout layout;
|
|
if (container == LauncherSettings.Favorites.CONTAINER_HOTSEAT
|
|
|| container == LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION) {
|
|
layout = getHotseat();
|
|
|
|
// Hide folder title in the hotseat
|
|
if (child instanceof FolderIcon) {
|
|
((FolderIcon) child).setTextVisible(false);
|
|
}
|
|
} else {
|
|
// Show folder title if not in the hotseat
|
|
if (child instanceof FolderIcon) {
|
|
((FolderIcon) child).setTextVisible(true);
|
|
}
|
|
layout = getScreenWithId(screenId);
|
|
}
|
|
|
|
ViewGroup.LayoutParams genericLp = child.getLayoutParams();
|
|
CellLayout.LayoutParams lp;
|
|
if (genericLp == null || !(genericLp instanceof CellLayout.LayoutParams)) {
|
|
lp = new CellLayout.LayoutParams(x, y, spanX, spanY);
|
|
} else {
|
|
lp = (CellLayout.LayoutParams) genericLp;
|
|
lp.cellX = x;
|
|
lp.cellY = y;
|
|
lp.cellHSpan = spanX;
|
|
lp.cellVSpan = spanY;
|
|
}
|
|
|
|
if (spanX < 0 && spanY < 0) {
|
|
lp.isLockedToGrid = false;
|
|
}
|
|
|
|
// Get the canonical child id to uniquely represent this view in this screen
|
|
ItemInfo info = (ItemInfo) child.getTag();
|
|
int childId = info.getViewId();
|
|
|
|
boolean markCellsAsOccupied = !(child instanceof Folder);
|
|
if (!layout.addViewToCellLayout(child, -1, childId, lp, markCellsAsOccupied)) {
|
|
// TODO: This branch occurs when the workspace is adding views
|
|
// outside of the defined grid
|
|
// maybe we should be deleting these items from the LauncherModel?
|
|
Log.e(TAG, "Failed to add to item at (" + lp.cellX + "," + lp.cellY + ") to CellLayout");
|
|
}
|
|
|
|
child.setHapticFeedbackEnabled(false);
|
|
child.setOnLongClickListener(ItemLongClickListener.INSTANCE_WORKSPACE);
|
|
if (child instanceof DropTarget) {
|
|
onAddDropTarget((DropTarget) child);
|
|
}
|
|
}
|
|
|
|
Hotseat getHotseat();
|
|
|
|
CellLayout getScreenWithId(int screenId);
|
|
|
|
default void onAddDropTarget(DropTarget target) { }
|
|
}
|