Merge changes from topic "am-85c6df09-b17a-490c-b342-44016a3b1282" into ub-launcher3-master

* changes:
  [automerger] Fix binder call for app opening am: 1d1a3d7242 am: 518a353826
  [automerger] Fix binder call for app opening am: 1d1a3d7242
  Fix binder call for app opening
This commit is contained in:
Jorim Jaggi 2018-05-29 17:40:56 +00:00 committed by Android (Google) Code Review
commit 7f80f7ba03
1 changed files with 2 additions and 5 deletions

View File

@ -594,11 +594,8 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
float offsetX = (scaledWindowWidth - iconWidth) / 2; float offsetX = (scaledWindowWidth - iconWidth) / 2;
float offsetY = (scaledWindowHeight - iconHeight) / 2; float offsetY = (scaledWindowHeight - iconHeight) / 2;
if (mLauncher.isInMultiWindowModeCompat()) {
mFloatingView.getLocationOnScreen(floatingViewBounds); mFloatingView.getLocationOnScreen(floatingViewBounds);
} else {
mFloatingView.getLocationInWindow(floatingViewBounds);
}
float transX0 = floatingViewBounds[0] - offsetX; float transX0 = floatingViewBounds[0] - offsetX;
float transY0 = floatingViewBounds[1] - offsetY; float transY0 = floatingViewBounds[1] - offsetY;
matrix.postTranslate(transX0, transY0); matrix.postTranslate(transX0, transY0);