commit f0d79cbac1f89c300d7a41c49a94c44c10254eb8
author Schneider Victor-tulias <victortulias@google.com> Wed Dec 02 16:02:30 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 02 16:02:30 2020 +0000
tree 661348193004a7476a1ef03c9d4a59a9119f770b
parent 620c249929a1e461a6e44b7ae5ed6fc0020f2ce6
parent f6f41535bf0358dbd3d5437249d66b97cc00c88d

Merge "Disable app theme crossfade animation."

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 058eca8..ca4f6ee 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -221,6 +221,8 @@
 
     static final boolean DEBUG_STRICT_MODE = false;
 
+    private static final boolean ENABLE_ACTIVITY_CROSSFADE = false;
+
     private static final int REQUEST_CREATE_SHORTCUT = 1;
     private static final int REQUEST_CREATE_APPWIDGET = 5;
 
@@ -1376,7 +1378,8 @@
         int width = mDragLayer.getWidth();
         int height = mDragLayer.getHeight();
 
-        if (width <= 0 || height <= 0) {
+        // TODO: b/172467144 Remove hardcoded ENABLE_ACTIVITY_CROSSFADE.
+        if (!ENABLE_ACTIVITY_CROSSFADE || width <= 0 || height <= 0) {
             return null;
         }