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

Commit 42261976 authored by Shan Huang's avatar Shan Huang Committed by Automerger Merge Worker
Browse files

Merge "Remove OnBackInvokedDispatcherOwner interface." into tm-dev am: bf8817d3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17511152



Change-Id: Iceedcf61348e0a77961515aafce4feca0a8bf92b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 478f09b4 bf8817d3

core/api/current.txt

+3 −6
Original line number Diff line number Diff line
@@ -4074,7 +4074,7 @@ package android.app { 
    method @Deprecated public void onTabUnselected(android.app.ActionBar.Tab, android.app.FragmentTransaction);

  }













  @UiContext public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.window.OnBackInvokedDispatcherOwner android.view.View.OnCreateContextMenuListener android.view.Window.Callback {













  @UiContext public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback {















    ctor public Activity();















    method public void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);















    method public void closeContextMenu();










@@ -5018,7 +5018,7 @@ package android.app {













    method public void onDateSet(android.widget.DatePicker, int, int, int);















  }



























  public class Dialog implements android.content.DialogInterface android.view.KeyEvent.Callback android.window.OnBackInvokedDispatcherOwner android.view.View.OnCreateContextMenuListener android.view.Window.Callback {













  public class Dialog implements android.content.DialogInterface android.view.KeyEvent.Callback android.view.View.OnCreateContextMenuListener android.view.Window.Callback {















    ctor public Dialog(@NonNull @UiContext android.content.Context);















    ctor public Dialog(@NonNull @UiContext android.content.Context, @StyleRes int);















    ctor protected Dialog(@NonNull @UiContext android.content.Context, boolean, @Nullable android.content.DialogInterface.OnCancelListener);










@@ -51087,6 +51087,7 @@ package android.view {













    method public android.media.session.MediaController getMediaController();















    method @ColorInt public abstract int getNavigationBarColor();















    method @ColorInt public int getNavigationBarDividerColor();













    method @NonNull public android.window.OnBackInvokedDispatcher getOnBackInvokedDispatcher();















    method public android.transition.Transition getReenterTransition();















    method public android.transition.Transition getReturnTransition();















    method @Nullable public android.view.AttachedSurfaceControl getRootSurfaceControl();










@@ -57991,10 +57992,6 @@ package android.window {













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















  }



























  public interface OnBackInvokedDispatcherOwner {













    method @NonNull public android.window.OnBackInvokedDispatcher getOnBackInvokedDispatcher();













  }



























  public interface SplashScreen {















    method public void clearOnExitAnimationListener();















    method public void setOnExitAnimationListener(@NonNull android.window.SplashScreen.OnExitAnimationListener);

























core/api/module-lib-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -11,7 +11,7 @@ package android {





























package android.app {





























  @UiContext public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.window.OnBackInvokedDispatcherOwner android.view.View.OnCreateContextMenuListener android.view.Window.Callback {













  @UiContext public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback {















    method public final boolean addDumpable(@NonNull android.util.Dumpable);















  }

















































core/api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -469,7 +469,7 @@ package android.accounts {



























package android.app {



























  @UiContext public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.window.OnBackInvokedDispatcherOwner android.view.View.OnCreateContextMenuListener android.view.Window.Callback {













  @UiContext public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback {















    method public void convertFromTranslucent();















    method public boolean convertToTranslucent(android.app.Activity.TranslucentConversionListener, android.app.ActivityOptions);















    method @Deprecated public boolean isBackgroundVisibleBehind();

























core/api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -104,7 +104,7 @@ package android.animation {





























package android.app {





























  @UiContext public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.window.OnBackInvokedDispatcherOwner android.view.View.OnCreateContextMenuListener android.view.Window.Callback {













  @UiContext public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback {















    method public final boolean addDumpable(@NonNull android.util.Dumpable);















    method public void dumpInternal(@NonNull String, @Nullable java.io.FileDescriptor, @NonNull java.io.PrintWriter, @Nullable String[]);















    method public void onMovedToDisplay(int, android.content.res.Configuration);

































core/java/android/app/Activity.java



+2
−5




























Original line number
Diff line number
Diff line








@@ -148,7 +148,6 @@ import android.widget.Toast;













import android.widget.Toolbar;















import android.window.OnBackInvokedCallback;















import android.window.OnBackInvokedDispatcher;













import android.window.OnBackInvokedDispatcherOwner;















import android.window.SplashScreen;















import android.window.WindowOnBackInvokedDispatcher;


























@@ -749,8 +748,7 @@ public class Activity extends ContextThemeWrapper













        Window.Callback, KeyEvent.Callback,















        OnCreateContextMenuListener, ComponentCallbacks2,















        Window.OnWindowDismissedCallback,













        ContentCaptureManager.ContentCaptureClient,













        OnBackInvokedDispatcherOwner {













        ContentCaptureManager.ContentCaptureClient {















    private static final String TAG = "Activity";















    private static final boolean DEBUG_LIFECYCLE = false;


























@@ -8993,12 +8991,11 @@ public class Activity extends ContextThemeWrapper













     * @throws IllegalStateException if this Activity is not visual.















     */















    @NonNull













    @Override















    public OnBackInvokedDispatcher getOnBackInvokedDispatcher() {















        if (mWindow == null) {















            throw new IllegalStateException("OnBackInvokedDispatcher are not available on "















                    + "non-visual activities");















        }













        return ((OnBackInvokedDispatcherOwner) mWindow).getOnBackInvokedDispatcher();













        return mWindow.getOnBackInvokedDispatcher();















    }















}