diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2018-05-29 17:40:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-29 17:40:56 +0000 |
| commit | 87356e7b485b76eee4ddc88b43b23817dd673a97 (patch) | |
| tree | c911df16820a6bfb27fa564849660a6bc11f799a | |
| parent | 03aaced25213dd2a8dc03a44213f821fea53236d (diff) | |
| parent | 1d1a3d7242d0c0e89c856d00e06bc3df7b55bc9d (diff) | |
| download | android_packages_apps_Trebuchet-87356e7b485b76eee4ddc88b43b23817dd673a97.tar.gz android_packages_apps_Trebuchet-87356e7b485b76eee4ddc88b43b23817dd673a97.tar.bz2 android_packages_apps_Trebuchet-87356e7b485b76eee4ddc88b43b23817dd673a97.zip | |
Merge "Fix binder call for app opening" into ub-launcher3-edmonton
| -rw-r--r-- | quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java index eea71ca98..2630edb3d 100644 --- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java +++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java @@ -594,11 +594,8 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag float offsetX = (scaledWindowWidth - iconWidth) / 2; float offsetY = (scaledWindowHeight - iconHeight) / 2; - if (mLauncher.isInMultiWindowModeCompat()) { - mFloatingView.getLocationOnScreen(floatingViewBounds); - } else { - mFloatingView.getLocationInWindow(floatingViewBounds); - } + mFloatingView.getLocationOnScreen(floatingViewBounds); + float transX0 = floatingViewBounds[0] - offsetX; float transY0 = floatingViewBounds[1] - offsetY; matrix.postTranslate(transX0, transY0); |