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

Commit 4b85b350 authored by Vadim Caen's avatar Vadim Caen Committed by Automerger Merge Worker
Browse files

Merge "Move OnBackInvokedCallback to window package." into tm-dev am: 8fa56677 

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

Change-Id: I5c1d3d013bb442ca9803fe80e2459620e38fe5d0
parents c4a2e214 8fa56677

core/api/current.txt

+19 −19
Original line number Diff line number Diff line
@@ -4073,7 +4073,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.view.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.window.OnBackInvokedDispatcherOwner 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();










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













    method public int getMaxNumPictureInPictureActions();















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















    method @NonNull public android.view.MenuInflater getMenuInflater();













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













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















    method public final android.app.Activity getParent();















    method @Nullable public android.content.Intent getParentActivityIntent();















    method public android.content.SharedPreferences getPreferences(int);










@@ -5002,7 +5002,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.view.OnBackInvokedDispatcherOwner android.view.View.OnCreateContextMenuListener android.view.Window.Callback {













  public class Dialog implements android.content.DialogInterface android.view.KeyEvent.Callback android.window.OnBackInvokedDispatcherOwner 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);









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













    method @NonNull @UiContext public final android.content.Context getContext();















    method @Nullable public android.view.View getCurrentFocus();















    method @NonNull public android.view.LayoutInflater getLayoutInflater();













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













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















    method @Nullable public final android.app.Activity getOwnerActivity();















    method @Nullable public final android.view.SearchEvent getSearchEvent();















    method public final int getVolumeControlStream();










@@ -49032,21 +49032,6 @@ package android.view {













    field public int toolType;















  }



























  public interface OnBackInvokedCallback {













    method public default void onBackInvoked();













  }

























  public interface OnBackInvokedDispatcher {













    method public void registerOnBackInvokedCallback(@NonNull android.view.OnBackInvokedCallback, @IntRange(from=0) int);













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













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













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













  }

























  public interface OnBackInvokedDispatcherOwner {













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













  }



























  public interface OnReceiveContentListener {















    method @Nullable public android.view.ContentInfo onReceiveContent(@NonNull android.view.View, @NonNull android.view.ContentInfo);















  }










@@ -57908,6 +57893,21 @@ package android.widget.inline {



























package android.window {



























  public interface OnBackInvokedCallback {













    method public default void onBackInvoked();













  }

























  public interface OnBackInvokedDispatcher {













    method public void registerOnBackInvokedCallback(@NonNull android.window.OnBackInvokedCallback, @IntRange(from=0) int);













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













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













    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








@@ -10,7 +10,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.view.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.window.OnBackInvokedDispatcherOwner 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








@@ -463,7 +463,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.view.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.window.OnBackInvokedDispatcherOwner 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



+5
−5




























Original line number
Diff line number
Diff line








@@ -103,7 +103,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.view.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.window.OnBackInvokedDispatcherOwner 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);










@@ -2833,10 +2833,6 @@ package android.view {













    field public static final int FLAG_IS_ACCESSIBILITY_EVENT = 2048; // 0x800















  }





























  public interface OnBackInvokedDispatcher {













    field public static final long DISPATCH_BACK_INVOCATION_AHEAD_OF_TIME = 195946584L; // 0xbade858L













  }





























  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD}) public @interface RemotableViewMethod {















    method public abstract String asyncImpl() default "";















  }










@@ -3250,6 +3246,10 @@ package android.window {













    field public static final int FEATURE_WINDOW_TOKENS = 2; // 0x2















  }





























  public interface OnBackInvokedDispatcher {













    field public static final long DISPATCH_BACK_INVOCATION_AHEAD_OF_TIME = 195946584L; // 0xbade858L













  }





























  public final class SplashScreenView extends android.widget.FrameLayout {















    method @Nullable public android.view.View getBrandingView();















  }

































core/java/android/app/Activity.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -120,9 +120,6 @@ import android.view.Menu;













import android.view.MenuInflater;















import android.view.MenuItem;















import android.view.MotionEvent;













import android.view.OnBackInvokedCallback;













import android.view.OnBackInvokedDispatcher;













import android.view.OnBackInvokedDispatcherOwner;















import android.view.RemoteAnimationDefinition;















import android.view.SearchEvent;















import android.view.View;









@@ -149,6 +146,9 @@ import android.view.translation.UiTranslationSpec;













import android.widget.AdapterView;















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;