Add proper annotations for Android SDK

android-sdk-annotations/android/view/accessibility/annotations.xml

@@ -1,14 +1,86 @@
 <root>
+    <item name='android.view.accessibility.AccessibilityRecord java.util.List&lt;java.lang.CharSequence&gt; getText()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.accessibility.AccessibilityNodeInfo void getBoundsInScreen(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT'>
+    <item name='android.view.accessibility.AccessibilityNodeInfo android.util.SparseLongArray getChildNodeIds()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain(android.view.accessibility.AccessibilityNodeInfo)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityEvent void initFromParcel(android.os.Parcel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityRecord android.view.accessibility.AccessibilityRecord obtain(android.view.accessibility.AccessibilityRecord)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityInteractionClient android.view.accessibility.AccessibilityInteractionClient getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityInteractionClient java.util.List&lt;android.view.accessibility.AccessibilityNodeInfo&gt; findAccessibilityNodeInfosByText(int, int, long, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityInteractionConnection.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfoCache void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityInteractionConnectionCallback.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityManager android.view.accessibility.IAccessibilityManagerClient getClient()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityRecord android.view.accessibility.AccessibilityRecord obtain()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfo void setBoundsInScreen(android.graphics.Rect) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityManager AccessibilityManager(android.content.Context, android.view.accessibility.IAccessibilityManager, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityManager void createAsSharedAcrossUsers(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityEvent android.view.accessibility.AccessibilityEvent obtain(android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityRecord java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityEvent android.view.accessibility.AccessibilityEvent obtain(android.view.accessibility.AccessibilityEvent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityManagerClient.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityEvent java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.accessibility.AccessibilityNodeInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityEvent void initFromParcel(android.os.Parcel) 0'>
+    <item name='android.view.accessibility.AccessibilityEvent android.view.accessibility.AccessibilityEvent obtain()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityManager java.util.List&lt;android.accessibilityservice.AccessibilityServiceInfo&gt; getInstalledAccessibilityServiceList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.accessibility.AccessibilityNodeInfo void getBoundsInParent(android.graphics.Rect) 0'>
@@ -20,52 +92,43 @@
     <item name='android.view.accessibility.AccessibilityEvent android.view.accessibility.AccessibilityEvent obtain(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityManager void sendAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
+    <item name='android.view.accessibility.AccessibilityNodeInfoCache void add(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo ACTION_ARGUMENT_HTML_ELEMENT_STRING'>
+    <item name='android.view.accessibility.AccessibilityNodeInfo java.util.List&lt;android.view.accessibility.AccessibilityNodeInfo&gt; findAccessibilityNodeInfosByViewId(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View)'>
+    <item name='android.view.accessibility.AccessibilityManager java.util.List&lt;android.content.pm.ServiceInfo&gt; getAccessibilityServiceList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityRecord java.util.List&lt;java.lang.CharSequence&gt; getText()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityEventSource void sendAccessibilityEventUnchecked(android.view.accessibility.AccessibilityEvent) 0'>
+    <item name='android.view.accessibility.AccessibilityInteractionClient void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.accessibility.AccessibilityRecord android.view.accessibility.AccessibilityRecord obtain(android.view.accessibility.AccessibilityRecord) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityEvent android.view.accessibility.AccessibilityEvent obtain(android.view.accessibility.AccessibilityEvent)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.accessibility.AccessibilityEvent void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo void setBoundsInScreen(android.graphics.Rect) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityEvent android.view.accessibility.AccessibilityEvent obtain(android.view.accessibility.AccessibilityEvent) 0'>
+    <item name='android.view.accessibility.AccessibilityNodeInfo java.util.List&lt;android.view.accessibility.AccessibilityNodeInfo&gt; findAccessibilityNodeInfosByText(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.accessibility.AccessibilityInteractionClient android.view.accessibility.AccessibilityInteractionClient getInstanceForThread(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.accessibility.AccessibilityEvent java.lang.String eventTypeToString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityEvent android.view.accessibility.AccessibilityEvent obtain()'>
+    <item name='android.view.accessibility.AccessibilityInteractionClient java.util.List&lt;android.view.accessibility.AccessibilityNodeInfo&gt; findAccessibilityNodeInfosByViewId(int, int, long, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain(android.view.accessibility.AccessibilityNodeInfo)'>
+    <item name='android.view.accessibility.AccessibilityManager java.util.List&lt;android.accessibilityservice.AccessibilityServiceInfo&gt; getEnabledAccessibilityServiceList(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>

android-sdk-annotations/android/view/animation/annotations.xml

@@ -1,17 +1,17 @@
 <root>
-    <item name='android.view.animation.AnimationSet java.util.List&lt;android.view.animation.Animation&gt; getAnimations()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.animation.RotateAnimation RotateAnimation(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeOutAnimation(android.content.Context, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.AnimationUtils android.view.animation.Interpolator loadInterpolator(android.content.Context, int) 0'>
+    <item name='android.view.animation.AnticipateOvershootInterpolator AnticipateOvershootInterpolator(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.AnticipateOvershootInterpolator AnticipateOvershootInterpolator(android.content.Context, android.util.AttributeSet) 0'>
+    <item name='android.view.animation.AnimationSet android.view.animation.AnimationSet clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.animation.AnimationUtils android.view.animation.Interpolator loadInterpolator(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.animation.CycleInterpolator CycleInterpolator(android.content.Context, android.util.AttributeSet) 0'>
@@ -20,6 +20,9 @@
     <item name='android.view.animation.LayoutAnimationController void setInterpolator(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.Animation android.view.animation.Animation clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.animation.AnimationSet AnimationSet(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -38,25 +41,19 @@
     <item name='android.view.animation.AnticipateInterpolator AnticipateInterpolator(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeInChildBottomAnimation(android.content.Context) 0'>
+    <item name='android.view.animation.LayoutAnimationController long getDelayForView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.animation.GridLayoutAnimationController GridLayoutAnimationController(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.LayoutAnimationController long getDelayForView(android.view.View) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.animation.AnimationSet void addAnimation(android.view.animation.Animation) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.animation.AccelerateInterpolator AccelerateInterpolator(android.content.Context, android.util.AttributeSet) 0'>
+    <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeInChildBottomAnimation(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.animation.LayoutAnimationController android.view.animation.Animation getAnimationForView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.Animation boolean getTransformation(long, android.view.animation.Transformation) 1'>
+    <item name='android.view.animation.AccelerateInterpolator AccelerateInterpolator(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.animation.LayoutAnimationController int getTransformedIndex(android.view.animation.LayoutAnimationController.AnimationParameters) 0'>
@@ -65,28 +62,46 @@
     <item name='android.view.animation.ScaleAnimation void applyTransformation(float, android.view.animation.Transformation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.Animation void getInvalidateRegion(int, int, int, int, android.graphics.RectF, android.view.animation.Transformation) 5'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.animation.AnimationSet java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.animation.AnimationUtils android.view.animation.Animation loadAnimation(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeInAnimation(android.content.Context, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.Animation void setInterpolator(android.content.Context, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.animation.ScaleAnimation ScaleAnimation(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.animation.DecelerateInterpolator DecelerateInterpolator(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeInAnimation(android.content.Context, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.animation.Transformation void postCompose(android.view.animation.Transformation) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.animation.AnimationSet android.view.animation.Animation clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.animation.LayoutAnimationController LayoutAnimationController(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.animation.Transformation void compose(android.view.animation.Transformation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.Animation void applyTransformation(float, android.view.animation.Transformation) 1'>
+    <item name='android.view.animation.OvershootInterpolator OvershootInterpolator(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.OvershootInterpolator OvershootInterpolator(android.content.Context, android.util.AttributeSet) 0'>
+    <item name='android.view.animation.Animation java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.animation.AnimationUtils android.view.animation.LayoutAnimationController loadLayoutAnimation(android.content.Context, int) 0'>
@@ -95,16 +110,28 @@
     <item name='android.view.animation.RotateAnimation void applyTransformation(float, android.view.animation.Transformation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.Transformation java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.animation.LayoutAnimationController void setAnimation(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeOutAnimation(android.content.Context, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.animation.AlphaAnimation void applyTransformation(float, android.view.animation.Transformation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeInChildBottomAnimation(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.animation.Transformation void printShortString(java.io.PrintWriter) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.animation.GridLayoutAnimationController long getDelayForView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.Transformation java.lang.String toShortString()'>
+    <item name='android.view.animation.Animation void getInvalidateRegion(int, int, int, int, android.graphics.RectF, android.view.animation.Transformation) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.animation.TranslateAnimation TranslateAnimation(android.content.Context, android.util.AttributeSet) 0'>
@@ -113,4 +140,10 @@
     <item name='android.view.animation.TranslateAnimation void applyTransformation(float, android.view.animation.Transformation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.Transformation void toShortString(java.lang.StringBuilder) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.animation.Transformation java.lang.String toShortString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>

android-sdk-annotations/android/view/inputmethod/annotations.xml

@@ -5,22 +5,34 @@
     <item name='android.view.inputmethod.CompletionInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.inputmethod.InputMethodSubtype java.lang.String getLocale()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputBinding java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.inputmethod.InputMethodSubtype void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.inputmethod.InputMethodInfo InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo, java.util.Map&lt;java.lang.String,java.util.List&lt;android.view.inputmethod.InputMethodSubtype&gt;&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.inputmethod.ExtractedText void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.inputmethod.InputMethodInfo InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethodSession void dispatchKeyEvent(int, android.view.KeyEvent, android.view.inputmethod.InputMethodSession.EventCallback) 1'>
+    <item name='android.view.inputmethod.InputMethodInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethod SERVICE_META_DATA'>
+    <item name='android.view.inputmethod.InputMethodInfo android.content.ComponentName getComponent()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethod void revokeSession(android.view.inputmethod.InputMethodSession) 0'>
+    <item name='android.view.inputmethod.CorrectionInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodManager void focusIn(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.inputmethod.BaseInputConnection void removeComposingSpans(android.text.Spannable) 0'>
@@ -29,28 +41,25 @@
     <item name='android.view.inputmethod.BaseInputConnection BaseInputConnection(android.view.View, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethod void changeInputMethodSubtype(android.view.inputmethod.InputMethodSubtype) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.InputMethodInfo android.content.ComponentName getComponent()'>
+    <item name='android.view.inputmethod.InputMethodManager com.android.internal.view.IInputContext getInputContext()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.inputmethod.CorrectionInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethod void setSessionEnabled(android.view.inputmethod.InputMethodSession, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.InputMethod void bindInput(android.view.inputmethod.InputBinding) 0'>
+    <item name='android.view.inputmethod.InputMethodManager java.util.Map&lt;android.view.inputmethod.InputMethodInfo,java.util.List&lt;android.view.inputmethod.InputMethodSubtype&gt;&gt; getShortcutInputMethodsAndSubtypes()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.inputmethod.EditorInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.inputmethod.InputMethodInfo InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo, java.util.Map&lt;java.lang.String,java.util.List&lt;android.view.inputmethod.InputMethodSubtype&gt;&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.inputmethod.EditorInfo void dump(android.util.Printer, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethod void createSession(android.view.inputmethod.InputMethod.SessionCallback) 0'>
+    <item name='android.view.inputmethod.BaseInputConnection void setComposingSpans(android.text.Spannable, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.inputmethod.InputMethodInfo void dump(android.util.Printer, java.lang.String) 0'>
@@ -59,40 +68,43 @@
     <item name='android.view.inputmethod.BaseInputConnection int getComposingSpanEnd(android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethodManager java.util.Map&lt;android.view.inputmethod.InputMethodInfo,java.util.List&lt;android.view.inputmethod.InputMethodSubtype&gt;&gt; getShortcutInputMethodsAndSubtypes()'>
+    <item name='android.view.inputmethod.CompletionInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethod SERVICE_INTERFACE'>
+    <item name='android.view.inputmethod.InputMethodManager void onWindowFocus(android.view.View, android.view.View, int, boolean, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodManager com.android.internal.view.IInputMethodClient getClient()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodSubtype java.lang.CharSequence getDisplayName(android.content.Context, java.lang.String, android.content.pm.ApplicationInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.inputmethod.InputMethodInfo InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethodSubtype java.lang.String getMode()'>
+    <item name='android.view.inputmethod.InputMethodSubtype java.lang.String getExtraValue()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.inputmethod.InputBinding void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethodSubtype java.lang.CharSequence getDisplayName(android.content.Context, java.lang.String, android.content.pm.ApplicationInfo) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.inputmethod.BaseInputConnection int getComposingSpanStart(android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputBinding InputBinding(android.view.inputmethod.InputConnection, android.view.inputmethod.InputBinding) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.inputmethod.BaseInputConnection void setComposingSpans(android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.inputmethod.InputBinding InputBinding(android.view.inputmethod.InputConnection, android.view.inputmethod.InputBinding) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodInfo InputMethodInfo(android.content.pm.ResolveInfo, boolean, java.lang.String, java.util.List&lt;android.view.inputmethod.InputMethodSubtype&gt;, int, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodSubtype java.lang.String getMode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.inputmethod.InputMethodInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethodSubtype java.lang.String getLocale()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.InputMethodSubtype java.lang.String getExtraValue()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>

android-sdk-annotations/android/view/textservice/annotations.xml

@@ -1,41 +1,77 @@
 <root>
-    <item name='android.view.textservice.SpellCheckerSession SERVICE_META_DATA'>
+    <item name='android.view.textservice.SpellCheckerInfo SpellCheckerInfo(android.content.Context, android.content.pm.ResolveInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.textservice.SuggestionsInfo SuggestionsInfo(android.os.Parcel) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.textservice.SpellCheckerSubtype java.lang.String getLocale()'>
+    <item name='android.view.textservice.SpellCheckerSession com.android.internal.textservice.ISpellCheckerSessionListener getSpellCheckerSessionListener()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.textservice.SpellCheckerSubtype void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.textservice.SpellCheckerInfo android.content.ComponentName getComponent()'>
+    <item name='android.view.textservice.SpellCheckerSession SpellCheckerSession(android.view.textservice.SpellCheckerInfo, com.android.internal.textservice.ITextServicesManager, android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener, android.view.textservice.SpellCheckerSubtype) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SpellCheckerSession SpellCheckerSession(android.view.textservice.SpellCheckerInfo, com.android.internal.textservice.ITextServicesManager, android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener, android.view.textservice.SpellCheckerSubtype) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.textservice.SpellCheckerSubtype java.lang.String getExtraValue()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.textservice.SentenceSuggestionsInfo void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.textservice.SentenceSuggestionsInfo SentenceSuggestionsInfo(android.os.Parcel) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.textservice.TextInfo TextInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.textservice.SuggestionsInfo void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.view.textservice.SpellCheckerInfo android.content.ComponentName getComponent()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.textservice.TextInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.textservice.SpellCheckerSubtype java.lang.CharSequence getDisplayName(android.content.Context, java.lang.String, android.content.pm.ApplicationInfo) 0'>
+    <item name='android.view.textservice.SentenceSuggestionsInfo SentenceSuggestionsInfo(android.view.textservice.SuggestionsInfo[], int[], int[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.textservice.SpellCheckerInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.textservice.SpellCheckerSubtype java.lang.String getLocale()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SentenceSuggestionsInfo SentenceSuggestionsInfo(android.view.textservice.SuggestionsInfo[], int[], int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SpellCheckerInfo SpellCheckerInfo(android.content.Context, android.content.pm.ResolveInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SuggestionsInfo SuggestionsInfo(android.os.Parcel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SpellCheckerSession SpellCheckerSession(android.view.textservice.SpellCheckerInfo, com.android.internal.textservice.ITextServicesManager, android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener, android.view.textservice.SpellCheckerSubtype) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SentenceSuggestionsInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SpellCheckerSession android.view.textservice.SpellCheckerInfo getSpellChecker()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SpellCheckerSubtype java.lang.CharSequence getDisplayName(android.content.Context, java.lang.String, android.content.pm.ApplicationInfo)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SentenceSuggestionsInfo SentenceSuggestionsInfo(android.os.Parcel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.TextServicesManager android.view.textservice.SpellCheckerSession newSpellCheckerSession(android.os.Bundle, java.util.Locale, android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener, boolean) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SpellCheckerSession com.android.internal.textservice.ITextServicesSessionListener getTextServicesSessionListener()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SpellCheckerInfo SpellCheckerInfo(android.os.Parcel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SuggestionsInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SentenceSuggestionsInfo SentenceSuggestionsInfo(android.view.textservice.SuggestionsInfo[], int[], int[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>