Fix inconsistencies in Android annotations

android-sdk-annotations/android/inputmethodservice/annotations.xml

@@ -14,9 +14,6 @@
     <item name='android.inputmethodservice.InputMethodService void onConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.Keyboard android.inputmethodservice.Keyboard.Row createRowFromXml(android.content.res.Resources, android.content.res.XmlResourceParser)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.inputmethodservice.ExtractEditLayout ExtractEditLayout(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -29,9 +26,6 @@
     <item name='android.inputmethodservice.InputMethodService.InputMethodImpl void changeInputMethodSubtype(android.view.inputmethod.InputMethodSubtype) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.Keyboard android.inputmethodservice.Keyboard.Key createKeyFromXml(android.content.res.Resources, android.inputmethodservice.Keyboard.Row, int, int, android.content.res.XmlResourceParser)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.inputmethodservice.ExtractEditText ExtractEditText(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -59,18 +53,12 @@
     <item name='android.inputmethodservice.KeyboardView KeyboardView(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.InputMethodService android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface()'>
+    <item name='android.inputmethodservice.Keyboard Keyboard(android.content.Context, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.inputmethodservice.InputMethodService void onUpdateExtractingVisibility(android.view.inputmethod.EditorInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.Keyboard.Key int[] getCurrentDrawableState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.inputmethodservice.Keyboard Keyboard(android.content.Context, int, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.inputmethodservice.Keyboard.Key Key(android.inputmethodservice.Keyboard.Row) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -89,7 +77,7 @@
     <item name='android.inputmethodservice.KeyboardView boolean onLongPress(android.inputmethodservice.Keyboard.Key) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.AbstractInputMethodService android.os.IBinder onBind(android.content.Intent)'>
+    <item name='android.inputmethodservice.ExtractEditText void replaceText_internal(int, int, java.lang.CharSequence) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.inputmethodservice.InputMethodService boolean onGenericMotionEvent(android.view.MotionEvent) 0'>
@@ -101,9 +89,15 @@
     <item name='android.inputmethodservice.ExtractEditLayout ExtractEditLayout(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.InputMethodService android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl onCreateInputMethodInterface()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.InputMethodService void onUpdateExtractingViews(android.view.inputmethod.EditorInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.InputMethodService boolean onTrackballEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl void dispatchKeyEvent(int, android.view.KeyEvent, android.view.inputmethod.InputMethodSession.EventCallback) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -119,9 +113,6 @@
     <item name='android.inputmethodservice.KeyboardView KeyboardView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.AbstractInputMethodService android.view.KeyEvent.DispatcherState getKeyDispatcherState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.inputmethodservice.ExtractEditText ExtractEditText(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -131,6 +122,9 @@
     <item name='android.inputmethodservice.KeyboardView KeyboardView(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.Keyboard android.inputmethodservice.Keyboard.Key createKeyFromXml(android.content.res.Resources, android.inputmethodservice.Keyboard.Row, int, int, android.content.res.XmlResourceParser)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.Keyboard android.inputmethodservice.Keyboard.Key createKeyFromXml(android.content.res.Resources, android.inputmethodservice.Keyboard.Row, int, int, android.content.res.XmlResourceParser) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -143,6 +137,9 @@
     <item name='android.inputmethodservice.AbstractInputMethodService android.os.IBinder onBind(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.AbstractInputMethodService android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.InputMethodService.InputMethodImpl void bindInput(android.view.inputmethod.InputBinding) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -155,39 +152,57 @@
     <item name='android.inputmethodservice.AbstractInputMethodService boolean onGenericMotionEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.InputMethodService boolean onKeyMultiple(int, int, android.view.KeyEvent) 2'>
+    <item name='android.inputmethodservice.AbstractInputMethodService android.view.KeyEvent.DispatcherState getKeyDispatcherState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.inputmethodservice.InputMethodService android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.inputmethodservice.Keyboard.Row Row(android.content.res.Resources, android.inputmethodservice.Keyboard, android.content.res.XmlResourceParser) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.InputMethodService boolean onKeyMultiple(int, int, android.view.KeyEvent) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.ExtractEditText ExtractEditText(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.InputMethodService android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl onCreateInputMethodInterface()'>
+    <item name='android.inputmethodservice.Keyboard android.inputmethodservice.Keyboard.Row createRowFromXml(android.content.res.Resources, android.content.res.XmlResourceParser)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.inputmethodservice.AbstractInputMethodService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.inputmethodservice.KeyboardView KeyboardView(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.AbstractInputMethodService android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface()'>
+    <item name='android.inputmethodservice.AbstractInputMethodService boolean onTrackballEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.inputmethodservice.Keyboard.Row Row(android.content.res.Resources, android.inputmethodservice.Keyboard, android.content.res.XmlResourceParser) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.InputMethodService void setInputView(android.view.View) 0'>
+    <item name='android.inputmethodservice.Keyboard Keyboard(android.content.Context, int, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.Keyboard Keyboard(android.content.Context, int, int, int, int) 0'>
+    <item name='android.inputmethodservice.AbstractInputMethodService android.os.IBinder onBind(android.content.Intent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.inputmethodservice.InputMethodService void setInputView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl void createSession(android.view.inputmethod.InputMethod.SessionCallback) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.InputMethodService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.Keyboard Keyboard(android.content.Context, int, java.lang.CharSequence, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.Keyboard.Key int[] getCurrentDrawableState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.InputMethodService void onCurrentInputMethodSubtypeChanged(android.view.inputmethod.InputMethodSubtype) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>