From 1e7b4b850fc3cc141f81a053f3a0467993f11eb9 Mon Sep 17 00:00:00 2001 From: Zak Cohen Date: Wed, 3 Jun 2020 21:05:59 -0700 Subject: [PATCH] Resolve markers - Fix build break. Test: local compile Bug: 156757117 Change-Id: I95cdfa34ecde95768f82a14463a4b91cf5012d8e --- quickstep/src/com/android/quickstep/SystemUiProxy.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index cdffb91649..299e9e5af1 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -31,6 +31,7 @@ import android.view.MotionEvent; import com.android.launcher3.util.MainThreadInitializedObject; import com.android.systemui.shared.recents.IPinnedStackAnimationListener; import com.android.systemui.shared.recents.ISystemUiProxy; +import com.android.systemui.shared.recents.model.Task; /** * Holds the reference to SystemUI. @@ -344,8 +345,6 @@ public class SystemUiProxy implements ISystemUiProxy { } } } -<<<<<<< HEAD (e557ba Merging from ub-launcher3-rvc-dev @ build 6552182) -======= @Override public void handleImageBundleAsScreenshot(Bundle screenImageBundle, Rect locationInScreen, @@ -359,5 +358,4 @@ public class SystemUiProxy implements ISystemUiProxy { } } } ->>>>>>> CHANGE (03e456 Screenshots - move to new api that uses image bundle.) }