Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcbe280f authored by Zak Cohen's avatar Zak Cohen Committed by Automerger Merge Worker
Browse files

Resolve markers - Fix build break. am: 1e7b4b85 am: 910e895a 

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

Change-Id: I34fd11734e012a23b6263ec9a9ba7c006c9acdb4
parents 3be40590 910e895a

quickstep/src/com/android/quickstep/SystemUiProxy.java

+1 −3
Original line number Diff line number Diff line
@@ -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.)

}