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

Merge "Fix RTL bug when swiping up to home." into ub-launcher3-qt-dev

Browse Source 
am: 2fc528b833

Change-Id: Ie450455fa1049b5b4e0b334625704cdf54e0ac5c
This commit is contained in:
Jon Miranda
2019-04-30 15:56:35 -07:00
committed by android-build-merger
parent 57b625399a 2fc528b833
commit dcee5bb7a5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
+6 -4
View File
@@ -117,9 +117,11 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe
workspaceView = null;
}
final Rect iconLocation = new Rect();
final FloatingIconView floatingView = workspaceView == null ? null
: FloatingIconView.getFloatingIconView(activity, workspaceView,
true /* hideOriginal */, iconLocation, false /* isOpening */, null /* recycle */);
boolean canUseWorkspaceView = workspaceView != null && workspaceView.isAttachedToWindow();
final FloatingIconView floatingView = canUseWorkspaceView
? FloatingIconView.getFloatingIconView(activity, workspaceView,
true /* hideOriginal */, iconLocation, false /* isOpening */, null /* recycle */)
: null;
return new HomeAnimationFactory() {
@Nullable
@@ -135,7 +137,7 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe
final float targetCenterX = dp.availableWidthPx / 2f;
final float targetCenterY = dp.availableHeightPx - dp.hotseatBarSizePx;
if (workspaceView != null) {
if (canUseWorkspaceView) {
return new RectF(iconLocation);
} else {
// Fallback to animate to center of screen.