commit 808e7cae6677695be4a139374f34c3ed87ba6385
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 08 23:59:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 08 23:59:21 2018 +0000
tree ab3e3820b6f1ff8cfa3a8d77d875c3643b16e337
parent 03f17fabf0e4f9ad92c1a6ed92f1bf7c31872b10
parent 1b9c3d6fe3c1cfae239aa003b96d53f93d85f4a5

Merge "Changed the Task Menu to overlay on top of the task view" into ub-launcher3-edmonton-polish

quickstep/AndroidManifest.xml

diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 778866d..cb74855 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -31,7 +31,7 @@
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher_home"
         android:label="@string/derived_app_name"
-        android:theme="@style/LauncherTheme"
+        android:theme="@style/AppTheme"
         android:largeHeap="@bool/config_largeHeap"
         android:restoreAnyVersion="true"
         android:supportsRtl="true" >

quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
index 4c90cbe..72d6260 100644
--- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -618,7 +618,7 @@
                         targetCrop = crop;
                         alpha = mAlpha.value;
                     } else {
-                        matrix.reset();
+                        matrix.setTranslate(target.position.x, target.position.y);
                         alpha = 1f;
                         targetCrop = target.sourceContainerBounds;
                     }
@@ -736,7 +736,7 @@
                         matrix.postTranslate(target.position.x, target.position.y);
                         alpha = mAlpha.value;
                     } else {
-                        matrix.reset();
+                        matrix.setTranslate(target.position.x, target.position.y);
                         alpha = 1f;
                     }
                     params[i] = new SurfaceParams(target.leash, alpha, matrix,