| commit | 67feabb46ed75b4b112783c5bc49cb7dd01b1584 | [log] [tgz] |
|---|---|---|
| author | Zak Cohen <zakcohen@google.com> | Thu Jun 04 04:55:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 04 04:55:30 2020 +0000 |
| tree | 6d9cd0e7fd7bbf8fd2fd83621f3edc021450e8a3 | |
| parent | abb3c73154cdc7647b3d0f4e4eb8384c5585556e [diff] | |
| parent | fcbe280fdc9a677ff99537827759718d277b856a [diff] |
Resolve markers - Fix build break. am: 1e7b4b850f am: 910e895a99 am: fcbe280fdc Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11725363 Change-Id: Ieec8c5f605fcc8881cd482647cd19958e4bbf9b2
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index cdffb91..299e9e5 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -31,6 +31,7 @@ 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 @@ } } } -<<<<<<< HEAD (e557ba Merging from ub-launcher3-rvc-dev @ build 6552182) -======= @Override public void handleImageBundleAsScreenshot(Bundle screenImageBundle, Rect locationInScreen, @@ -359,5 +358,4 @@ } } } ->>>>>>> CHANGE (03e456 Screenshots - move to new api that uses image bundle.) }