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

Commit fd857e37 authored by Kenneth Ford's avatar Kenneth Ford Committed by Android (Google) Code Review
Browse files

Merge "Update api current.txt with context type annotations" into sc-dev

parents d9eaeefb d391f1d9

core/api/current.txt

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

  }













  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 {













  @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();










@@ -4771,9 +4771,9 @@ package android.app {













  }





























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













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













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













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













    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);















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















    method public void cancel();















    method public void closeOptionsMenu();









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













    method public boolean dispatchTrackballEvent(@NonNull android.view.MotionEvent);















    method public <T extends android.view.View> T findViewById(@IdRes int);















    method @Nullable public android.app.ActionBar getActionBar();













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













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















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















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















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










@@ -10346,10 +10346,10 @@ package android.content {













    method @NonNull public android.content.Context createContext(@NonNull android.content.ContextParams);















    method public abstract android.content.Context createContextForSplit(String) throws android.content.pm.PackageManager.NameNotFoundException;















    method public abstract android.content.Context createDeviceProtectedStorageContext();













    method public abstract android.content.Context createDisplayContext(@NonNull android.view.Display);













    method @DisplayContext public abstract android.content.Context createDisplayContext(@NonNull android.view.Display);















    method public abstract android.content.Context createPackageContext(String, int) throws android.content.pm.PackageManager.NameNotFoundException;













    method @NonNull public android.content.Context createWindowContext(int, @Nullable android.os.Bundle);













    method @NonNull public android.content.Context createWindowContext(@NonNull android.view.Display, int, @Nullable android.os.Bundle);













    method @NonNull @UiContext public android.content.Context createWindowContext(int, @Nullable android.os.Bundle);













    method @NonNull @UiContext public android.content.Context createWindowContext(@NonNull android.view.Display, int, @Nullable android.os.Bundle);















    method public abstract String[] databaseList();















    method public abstract boolean deleteDatabase(String);















    method public abstract boolean deleteFile(String);










@@ -10514,7 +10514,7 @@ package android.content {













    field public static final String JOB_SCHEDULER_SERVICE = "jobscheduler";















    field public static final String KEYGUARD_SERVICE = "keyguard";















    field public static final String LAUNCHER_APPS_SERVICE = "launcherapps";













    field public static final String LAYOUT_INFLATER_SERVICE = "layout_inflater";













    field @UiContext public static final String LAYOUT_INFLATER_SERVICE = "layout_inflater";















    field public static final String LOCATION_SERVICE = "location";















    field public static final String MEDIA_COMMUNICATION_SERVICE = "media_communication";















    field public static final String MEDIA_METRICS_SERVICE = "media_metrics";










@@ -10559,12 +10559,12 @@ package android.content {













    field public static final String VIBRATOR_MANAGER_SERVICE = "vibrator_manager";















    field public static final String VIBRATOR_SERVICE = "vibrator";















    field public static final String VPN_MANAGEMENT_SERVICE = "vpn_management";













    field public static final String WALLPAPER_SERVICE = "wallpaper";













    field @UiContext public static final String WALLPAPER_SERVICE = "wallpaper";















    field public static final String WIFI_AWARE_SERVICE = "wifiaware";















    field public static final String WIFI_P2P_SERVICE = "wifip2p";















    field public static final String WIFI_RTT_RANGING_SERVICE = "wifirtt";















    field public static final String WIFI_SERVICE = "wifi";













    field public static final String WINDOW_SERVICE = "window";













    field @UiContext public static final String WINDOW_SERVICE = "window";















  }





























  public final class ContextParams {










@@ -19058,7 +19058,7 @@ package android.inputmethodservice {













    method public void startInternalChanges();















  }



























  public class InputMethodService extends android.inputmethodservice.AbstractInputMethodService {













  @UiContext public class InputMethodService extends android.inputmethodservice.AbstractInputMethodService {















    ctor public InputMethodService();















    method @Deprecated public boolean enableHardwareAcceleration();















    method public int getBackDisposition();










@@ -46569,9 +46569,9 @@ package android.view {













  public class GestureDetector {















    ctor @Deprecated public GestureDetector(android.view.GestureDetector.OnGestureListener, android.os.Handler);















    ctor @Deprecated public GestureDetector(android.view.GestureDetector.OnGestureListener);













    ctor public GestureDetector(android.content.Context, android.view.GestureDetector.OnGestureListener);













    ctor public GestureDetector(android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler);













    ctor public GestureDetector(android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler, boolean);













    ctor public GestureDetector(@UiContext android.content.Context, android.view.GestureDetector.OnGestureListener);













    ctor public GestureDetector(@UiContext android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler);













    ctor public GestureDetector(@UiContext android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler, boolean);















    method public boolean isLongpressEnabled();















    method public boolean onGenericMotionEvent(android.view.MotionEvent);















    method public boolean onTouchEvent(android.view.MotionEvent);










@@ -47260,7 +47260,7 @@ package android.view {













    method public abstract android.view.LayoutInflater cloneInContext(android.content.Context);















    method public final android.view.View createView(String, String, android.util.AttributeSet) throws java.lang.ClassNotFoundException, android.view.InflateException;















    method @Nullable public final android.view.View createView(@NonNull android.content.Context, @NonNull String, @Nullable String, @Nullable android.util.AttributeSet) throws java.lang.ClassNotFoundException, android.view.InflateException;













    method public static android.view.LayoutInflater from(android.content.Context);













    method public static android.view.LayoutInflater from(@UiContext android.content.Context);















    method public android.content.Context getContext();















    method public final android.view.LayoutInflater.Factory getFactory();















    method public final android.view.LayoutInflater.Factory2 getFactory2();










@@ -48154,7 +48154,7 @@ package android.view {













    method public final boolean getClipToOutline();















    method @Nullable public final android.view.contentcapture.ContentCaptureSession getContentCaptureSession();















    method public CharSequence getContentDescription();













    method public final android.content.Context getContext();













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















    method protected android.view.ContextMenu.ContextMenuInfo getContextMenuInfo();















    method public final boolean getDefaultFocusHighlightEnabled();















    method public static int getDefaultSize(int, int);










@@ -48953,7 +48953,7 @@ package android.view {



























  public class ViewConfiguration {















    ctor @Deprecated public ViewConfiguration();













    method public static android.view.ViewConfiguration get(android.content.Context);













    method public static android.view.ViewConfiguration get(@UiContext android.content.Context);















    method @Deprecated @FloatRange(from=1.0) public static float getAmbiguousGestureMultiplier();















    method public static long getDefaultActionModeHideDuration();















    method public static int getDoubleTapTimeout();










@@ -49511,7 +49511,7 @@ package android.view {













  }





























  public abstract class Window {













    ctor public Window(android.content.Context);













    ctor public Window(@UiContext android.content.Context);















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















    method public void addFlags(int);















    method public final void addOnFrameMetricsAvailableListener(@NonNull android.view.Window.OnFrameMetricsAvailableListener, android.os.Handler);









@@ -49526,7 +49526,7 @@ package android.view {













    method public int getColorMode();















    method public final android.view.Window getContainer();















    method public android.transition.Scene getContentScene();













    method public final android.content.Context getContext();













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















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















    method @NonNull public abstract android.view.View getDecorView();















    method public static int getDefaultFeatures(android.content.Context);

























core/api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








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



























package android.app {



























  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 {













  @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



+2
−2




























Original line number
Diff line number
Diff line








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





























package android.app {





























  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 {













  @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 onMovedToDisplay(int, android.content.res.Configuration);















  }


























@@ -1176,7 +1176,7 @@ package android.hardware.soundtrigger {





























package android.inputmethodservice {





























  public class InputMethodService extends android.inputmethodservice.AbstractInputMethodService {













  @UiContext public class InputMethodService extends android.inputmethodservice.AbstractInputMethodService {















    field public static final long FINISH_INPUT_NO_FALLBACK_CONNECTION = 156215187L; // 0x94fa793L















  }