PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve markers - Fix build break. am: 1e7b4b850f am: 910e895a99

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11725363

Change-Id: I34fd11734e012a23b6263ec9a9ba7c006c9acdb4
This commit is contained in:
Zak Cohen
2020-06-04 04:39:02 +00:00
committed by Automerger Merge Worker
parent 3be40590c0 910e895a99
commit fcbe280fdc
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/SystemUiProxy.java
+1 -3
View File
@@ -31,6 +31,7 @@ import android.view.MotionEvent;
import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.util.MainThreadInitializedObject;
import com.android.systemui.shared.recents.IPinnedStackAnimationListener; import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
import com.android.systemui.shared.recents.ISystemUiProxy; import com.android.systemui.shared.recents.ISystemUiProxy;
import com.android.systemui.shared.recents.model.Task;
/** /**
* Holds the reference to SystemUI. * 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 @Override
public void handleImageBundleAsScreenshot(Bundle screenImageBundle, Rect locationInScreen, 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.)
} }