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

Commit 6229a022 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Clean up predictive_back_priority_system_navigation_observer flag" into main

parents f71648d6 a2eaa426

core/api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -63559,7 +63559,7 @@ package android.window { 
    method public void unregisterOnBackInvokedCallback(@NonNull android.window.OnBackInvokedCallback);

    method public void unregisterOnBackInvokedCallback(@NonNull android.window.OnBackInvokedCallback);

    field public static final int PRIORITY_DEFAULT = 0; // 0x0

    field public static final int PRIORITY_DEFAULT = 0; // 0x0

    field public static final int PRIORITY_OVERLAY = 1000000; // 0xf4240

    field public static final int PRIORITY_OVERLAY = 1000000; // 0xf4240

    field @FlaggedApi("com.android.window.flags.predictive_back_priority_system_navigation_observer") public static final int PRIORITY_SYSTEM_NAVIGATION_OBSERVER = -2; // 0xfffffffe

    field public static final int PRIORITY_SYSTEM_NAVIGATION_OBSERVER = -2; // 0xfffffffe

  }

  }

















  public interface SplashScreen {







  public interface SplashScreen {

























core/java/android/window/OnBackInvokedDispatcher.java



+0
−4




























Original line number
Original line
Diff line number
Diff line








@@ -16,14 +16,11 @@





























package android.window;







package android.window;































import android.annotation.FlaggedApi;














import android.annotation.IntDef;







import android.annotation.IntDef;











import android.annotation.IntRange;







import android.annotation.IntRange;











import android.annotation.NonNull;







import android.annotation.NonNull;











import android.annotation.SuppressLint;







import android.annotation.SuppressLint;































import com.android.window.flags.Flags;





























import java.lang.annotation.Retention;







import java.lang.annotation.Retention;











import java.lang.annotation.RetentionPolicy;







import java.lang.annotation.RetentionPolicy;






























@@ -91,7 +88,6 @@ public interface OnBackInvokedDispatcher {









     * {@link #PRIORITY_SYSTEM_NAVIGATION_OBSERVER} can be registered at a time. On API level 37 and







     * {@link #PRIORITY_SYSTEM_NAVIGATION_OBSERVER} can be registered at a time. On API level 37 and











     * higher, the number of registered observer callbacks is unrestricted.







     * higher, the number of registered observer callbacks is unrestricted.











     */







     */











    @FlaggedApi(Flags.FLAG_PREDICTIVE_BACK_PRIORITY_SYSTEM_NAVIGATION_OBSERVER)














    int PRIORITY_SYSTEM_NAVIGATION_OBSERVER = -2;







    int PRIORITY_SYSTEM_NAVIGATION_OBSERVER = -2;































    /**







    /**

































core/java/android/window/ProxyOnBackInvokedDispatcher.java



+3
−14




























Original line number
Original line
Diff line number
Diff line








@@ -16,8 +16,6 @@





























package android.window;







package android.window;































import static com.android.window.flags.Flags.predictiveBackPrioritySystemNavigationObserver;





























import android.annotation.NonNull;







import android.annotation.NonNull;











import android.annotation.Nullable;







import android.annotation.Nullable;











import android.content.Context;







import android.content.Context;










@@ -125,20 +123,11 @@ public class ProxyOnBackInvokedDispatcher implements OnBackInvokedDispatcher {









        }







        }











        for (Pair<OnBackInvokedCallback, Integer> callbackPair : mCallbacks) {







        for (Pair<OnBackInvokedCallback, Integer> callbackPair : mCallbacks) {











            int priority = callbackPair.second;







            int priority = callbackPair.second;











            if (predictiveBackPrioritySystemNavigationObserver()) {







            if (priority >= PRIORITY_DEFAULT || priority == PRIORITY_SYSTEM_NAVIGATION_OBSERVER) {











                if (priority >= PRIORITY_DEFAULT














                        || priority == PRIORITY_SYSTEM_NAVIGATION_OBSERVER) {














                mActualDispatcher.registerOnBackInvokedCallback(priority, callbackPair.first);







                mActualDispatcher.registerOnBackInvokedCallback(priority, callbackPair.first);











            } else {







            } else {











                mActualDispatcher.registerSystemOnBackInvokedCallback(callbackPair.first);







                mActualDispatcher.registerSystemOnBackInvokedCallback(callbackPair.first);











            }







            }











            } else {














                if (priority >= PRIORITY_DEFAULT) {














                    mActualDispatcher.registerOnBackInvokedCallback(priority, callbackPair.first);














                } else {














                    mActualDispatcher.registerSystemOnBackInvokedCallback(callbackPair.first);














                }














            }














        }







        }











        mCallbacks.clear();







        mCallbacks.clear();











        mImeDispatcher = null;







        mImeDispatcher = null;

































core/java/android/window/WindowOnBackInvokedDispatcher.java



+8
−20




























Original line number
Original line
Diff line number
Diff line








@@ -21,7 +21,6 @@ import static android.window.SystemOverrideOnBackInvokedCallback.OVERRIDE_UNDEFI









import static com.android.window.flags.Flags.multipleSystemNavigationObserverCallbacks;







import static com.android.window.flags.Flags.multipleSystemNavigationObserverCallbacks;











import static com.android.window.flags.Flags.predictiveBackCallbackCancellationFix;







import static com.android.window.flags.Flags.predictiveBackCallbackCancellationFix;











import static com.android.window.flags.Flags.predictiveBackSystemOverrideCallback;







import static com.android.window.flags.Flags.predictiveBackSystemOverrideCallback;











import static com.android.window.flags.Flags.predictiveBackPrioritySystemNavigationObserver;














import static com.android.window.flags.Flags.predictiveBackTimestampApi;







import static com.android.window.flags.Flags.predictiveBackTimestampApi;































import android.annotation.NonNull;







import android.annotation.NonNull;










@@ -214,8 +213,7 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher {









                mImeDispatcher.registerOnBackInvokedCallback(priority, callback);







                mImeDispatcher.registerOnBackInvokedCallback(priority, callback);











                return;







                return;











            }







            }











            if (predictiveBackPrioritySystemNavigationObserver()







            if (predictiveBackSystemOverrideCallback()) {











                    && predictiveBackSystemOverrideCallback()) {














                if (priority == PRIORITY_SYSTEM_NAVIGATION_OBSERVER







                if (priority == PRIORITY_SYSTEM_NAVIGATION_OBSERVER











                        && callback instanceof SystemOverrideOnBackInvokedCallback) {







                        && callback instanceof SystemOverrideOnBackInvokedCallback) {











                    Log.e(TAG, "System override callbacks cannot be registered to "







                    Log.e(TAG, "System override callbacks cannot be registered to "









@@ -223,12 +221,10 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher {









                    return;







                    return;











                }







                }











            }







            }











            if (predictiveBackPrioritySystemNavigationObserver()) {














            if (priority == PRIORITY_SYSTEM_NAVIGATION_OBSERVER) {







            if (priority == PRIORITY_SYSTEM_NAVIGATION_OBSERVER) {











                registerSystemNavigationObserverCallback(callback);







                registerSystemNavigationObserverCallback(callback);











                return;







                return;











            }







            }











            }














            if (callback instanceof ImeOnBackInvokedDispatcher.ImeOnBackInvokedCallback) {







            if (callback instanceof ImeOnBackInvokedDispatcher.ImeOnBackInvokedCallback) {











                if (callback instanceof ImeOnBackInvokedDispatcher.DefaultImeOnBackAnimationCallback







                if (callback instanceof ImeOnBackInvokedDispatcher.DefaultImeOnBackAnimationCallback











                        && mImeBackAnimationController != null) {







                        && mImeBackAnimationController != null) {










@@ -790,19 +786,11 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher {









                                + " application manifest.");







                                + " application manifest.");











                return false;







                return false;











            }







            }











            if (predictiveBackPrioritySystemNavigationObserver()) {














            if (priority < 0 && priority != PRIORITY_SYSTEM_NAVIGATION_OBSERVER) {







            if (priority < 0 && priority != PRIORITY_SYSTEM_NAVIGATION_OBSERVER) {











                throw new IllegalArgumentException("Application registered "







                throw new IllegalArgumentException("Application registered "











                        + "OnBackInvokedCallback cannot have negative priority. Priority: "







                        + "OnBackInvokedCallback cannot have negative priority. Priority: "











                        + priority);







                        + priority);











            }







            }











            } else {














                if (priority < 0) {














                    throw new IllegalArgumentException("Application registered "














                            + "OnBackInvokedCallback cannot have negative priority. Priority: "














                            + priority);














                }














            }














            Objects.requireNonNull(callback);







            Objects.requireNonNull(callback);











            return true;







            return true;











        }







        }