aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-05 02:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use FlingOnBackAnimationCallback for predictive back" into main

Browse Source
This commit is contained in:
Johannes Gallmann
2024-11-11 08:29:47 +00:00
committed by Android (Google) Code Review
parent 0cceb24288 600c1af779
commit f47df1f60a
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
quickstep/src/com/android/launcher3/WidgetPickerActivity.java
View File

@@ -55,6 +55,7 @@ import com.android.launcher3.widget.model.WidgetsListBaseEntriesBuilder;
import com.android.launcher3.widget.model.WidgetsListBaseEntry;
import com.android.launcher3.widget.picker.WidgetsFullSheet;
import com.android.launcher3.widget.picker.model.WidgetPickerDataProvider;
import com.android.systemui.animation.back.FlingOnBackAnimationCallback;
import java.util.ArrayList;
import java.util.HashSet;
@@ -374,12 +375,12 @@ public class WidgetPickerActivity extends BaseActivity {
/**
* Animation callback for different predictive back animation states for the widget picker.
*/
private class BackAnimationCallback implements OnBackAnimationCallback {
private class BackAnimationCallback extends FlingOnBackAnimationCallback {
@Nullable
OnBackAnimationCallback mActiveOnBackAnimationCallback;
@Override
public void onBackStarted(@NonNull BackEvent backEvent) {
public void onBackStartedCompat(@NonNull BackEvent backEvent) {
if (mActiveOnBackAnimationCallback != null) {
mActiveOnBackAnimationCallback.onBackCancelled();
}
@@ -390,7 +391,7 @@ public class WidgetPickerActivity extends BaseActivity {
}
@Override
public void onBackInvoked() {
public void onBackInvokedCompat() {
if (mActiveOnBackAnimationCallback == null) {
return;
}
@@ -399,7 +400,7 @@ public class WidgetPickerActivity extends BaseActivity {
}
@Override
public void onBackProgressed(@NonNull BackEvent backEvent) {
public void onBackProgressedCompat(@NonNull BackEvent backEvent) {
if (mActiveOnBackAnimationCallback == null) {
return;
}
@@ -407,7 +408,7 @@ public class WidgetPickerActivity extends BaseActivity {
}
@Override
public void onBackCancelled() {
public void onBackCancelledCompat() {
if (mActiveOnBackAnimationCallback == null) {
return;
}