Fix conflicts

This commit is contained in:
MrSluffy authored and Goooler committed 2024-01-08 16:03:01 +08:00
1 parent 3269857e66
commit 32922a2e02
25 files changed
+39 -358

No files matched your search

@@ -49,7 +49,7 @@ import java.lang.annotation.RetentionPolicy;
*/
@TargetApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
public abstract class AbstractFloatingView extends LinearLayout implements TouchController,
OnBackAnimationCallback {
OnBackPressedHandler {
@IntDef(flag = true, value = {
TYPE_COMPOSE_VIEW,
@@ -141,8 +141,6 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
public static final int TYPE_TASKBAR_OVERLAYS =
TYPE_TASKBAR_ALL_APPS | TYPE_TASKBAR_EDUCATION_DIALOG;
public static final int TYPE_ALL_EXCEPT_ON_BOARD_POPUP = TYPE_ALL & ~TYPE_ON_BOARD_POPUP;
protected boolean mIsOpen;
public AbstractFloatingView(Context context, AttributeSet attrs) {