aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add an animation for invalid widget resizing in 2 panel UI

Browse Source 
Test: manual
Fix: 197509872
Change-Id: Ibcfae107e7f4b3bfbc562d4a6436f4b9237db122
This commit is contained in:
Steven Ng
2021-09-14 19:17:09 +01:00
parent 8b30227f58
commit 4b346108d1
4 changed files with 140 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/launcher3/Workspace.java
View File

@@ -651,7 +651,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
// If the icon was dragged from Hotseat, there is no page pair
if (isTwoPanelEnabled() && !(mDragSourceInternal.getParent() instanceof Hotseat)) {
int pagePairScreenId = getPagePair(dragObject.dragInfo.screenId);
int pagePairScreenId = getScreenPair(dragObject.dragInfo.screenId);
CellLayout pagePair = mWorkspaceScreens.get(pagePairScreenId);
if (pagePair == null) {
// TODO: after http://b/198820019 is fixed, remove this
@@ -917,16 +917,33 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
}
/**
* Returns the page that is shown together with the given page when two panel is enabled.
* Returns the screen ID of a page that is shown together with the given page screen ID when the
* two panel UI is enabled.
*/
public int getPagePair(int page) {
if (page % 2 == 0) {
return page + 1;
public int getScreenPair(int screenId) {
if (screenId % 2 == 0) {
return screenId + 1;
} else {
return page - 1;
return screenId - 1;
}
}
/**
* Returns {@link CellLayout} that is shown together with the given {@link CellLayout} when the
* two panel UI is enabled.
*/
@Nullable
public CellLayout getScreenPair(CellLayout cellLayout) {
if (!isTwoPanelEnabled()) {
return null;
}
int screenId = getIdForScreen(cellLayout);
if (screenId == -1) {
return null;
}
return getScreenWithId(getScreenPair(screenId));
}
public void stripEmptyScreens() {
if (mLauncher.isWorkspaceLoading()) {
// Don't strip empty screens if the workspace is still loading.
@@ -959,7 +976,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
Iterator<Integer> removeScreensIterator = removeScreens.iterator();
while (removeScreensIterator.hasNext()) {
int pageToRemove = removeScreensIterator.next();
int pagePair = getPagePair(pageToRemove);
int pagePair = getScreenPair(pageToRemove);
if (!removeScreens.contains(pagePair)) {
// The page pair isn't empty so we want to remove the current page from the
// removable pages' collection