commit 8c8fdec3e967286106c369db18e8bb69e5da4542
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Dec 19 23:13:57 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 19 23:13:57 2017 +0000
tree 8c50469ee2ba924199f03869cd938b7040d7d51c
parent 069946b1ea0d9a002e49b9222f3f3aba8272b46d
parent 45e89c76bb0213437343c97776d2d5f6a2e57fb9

Merge "Surpress missing classes warnings from R8" into ub-launcher3-master

src/com/android/launcher3/anim/RevealOutlineAnimation.java

diff --git a/src/com/android/launcher3/anim/RevealOutlineAnimation.java b/src/com/android/launcher3/anim/RevealOutlineAnimation.java
index 1312da9..c6b62fa 100644
--- a/src/com/android/launcher3/anim/RevealOutlineAnimation.java
+++ b/src/com/android/launcher3/anim/RevealOutlineAnimation.java
@@ -34,7 +34,6 @@
         final float elevation = revealView.getElevation();
 
         va.addListener(new AnimatorListenerAdapter() {
-            private boolean mWasCanceled = false;
             private boolean mIsClippedToOutline;
             private ViewOutlineProvider mOldOutlineProvider;
 
@@ -49,18 +48,11 @@
                 }
             }
 
-            @Override
-            public void onAnimationCancel(Animator animation) {
-                mWasCanceled = true;
-            }
-
             public void onAnimationEnd(Animator animation) {
-                if (!mWasCanceled) {
-                    revealView.setOutlineProvider(mOldOutlineProvider);
-                    revealView.setClipToOutline(mIsClippedToOutline);
-                    if (shouldRemoveElevationDuringAnimation()) {
-                        revealView.setTranslationZ(0);
-                    }
+                revealView.setOutlineProvider(mOldOutlineProvider);
+                revealView.setClipToOutline(mIsClippedToOutline);
+                if (shouldRemoveElevationDuringAnimation()) {
+                    revealView.setTranslationZ(0);
                 }
             }
 

src/com/android/launcher3/shortcuts/ShortcutKey.java

diff --git a/src/com/android/launcher3/shortcuts/ShortcutKey.java b/src/com/android/launcher3/shortcuts/ShortcutKey.java
index e86bfb2..704d82f 100644
--- a/src/com/android/launcher3/shortcuts/ShortcutKey.java
+++ b/src/com/android/launcher3/shortcuts/ShortcutKey.java
@@ -1,6 +1,7 @@
 package com.android.launcher3.shortcuts;
 
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.os.UserHandle;
 
@@ -17,6 +18,10 @@
         super(new ComponentName(packageName, id), user);
     }
 
+    public ShortcutKey(Context context, String componentKeyStr) {
+        super(context, componentKeyStr);
+    }
+
     public String getId() {
         return componentName.getClassName();
     }