PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Scale using workspace width for handheld device on swiping from home to overview." into tm-qpr-dev am: 105d72b6ea am: 285121bddf am: ef2e9c51e3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21958125

Change-Id: I99d6cb87321761d7c835623517f8b535460b6a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pat Manning
2023-03-14 21:26:23 +00:00
committed by Automerger Merge Worker
parent c5cdf7f7a1 ef2e9c51e3
commit df96bb0ed8
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+10 -2
View File
@@ -75,9 +75,17 @@ public class OverviewState extends LauncherState {
@Override @Override
public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) { public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) {
RecentsView recentsView = launcher.getOverviewPanel(); RecentsView recentsView = launcher.getOverviewPanel();
float workspacePageHeight = launcher.getDeviceProfile().getCellLayoutHeight();
recentsView.getTaskSize(sTempRect); recentsView.getTaskSize(sTempRect);
float scale = (float) sTempRect.height() / workspacePageHeight; float scale;
DeviceProfile deviceProfile = launcher.getDeviceProfile();
if (deviceProfile.isTwoPanels) {
// In two panel layout, width does not include both panels or space between them, so
// use height instead. We do not use height for handheld, as cell layout can be
// shorter than a task and we want the workspace to scale down to task size.
scale = (float) sTempRect.height() / deviceProfile.getCellLayoutHeight();
} else {
scale = (float) sTempRect.width() / deviceProfile.getCellLayoutWidth();
}
float parallaxFactor = 0.5f; float parallaxFactor = 0.5f;
return new ScaleAndTranslation(scale, 0, -getDefaultSwipeHeight(launcher) * parallaxFactor); return new ScaleAndTranslation(scale, 0, -getDefaultSwipeHeight(launcher) * parallaxFactor);
} }