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

Commit 4a3cdb2f authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 2d75410f: Merge change 2748 into donut 

Merge commit '2d75410f'

* commit '2d75410f':
  Fix the build.
parents 91764697 2d75410f

api/current.xml

+431 −55
Original line number Diff line number Diff line
@@ -49580,10 +49580,75 @@ 
>

</field>

</class>

<class name="GestureLibrary"

<class name="GestureLibraries"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<method name="fromFile"

 return="android.gesture.GestureLibrary"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="path" type="java.lang.String">

</parameter>

</method>

<method name="fromFile"

 return="android.gesture.GestureLibrary"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="path" type="java.io.File">

</parameter>

</method>

<method name="fromPrivateFile"

 return="android.gesture.GestureLibrary"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="name" type="java.lang.String">

</parameter>

</method>

<method name="fromRawResource"

 return="android.gesture.GestureLibrary"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="resourceId" type="int">

</parameter>

</method>

</class>

<class name="GestureLibrary"

 extends="java.lang.Object"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"
@@ -49593,10 +49658,8 @@ 
 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

 visibility="protected"

>

<parameter name="path" type="java.lang.String">

</parameter>

</constructor>

<method name="addGesture"

 return="void"
@@ -49637,6 +49700,17 @@ 
<parameter name="entryName" type="java.lang.String">

</parameter>

</method>

<method name="getLearner"

 return="android.gesture.Learner"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getOrientationStyle"

 return="int"

 abstract="false"
@@ -49659,7 +49733,7 @@ 
 visibility="public"

>

</method>

<method name="load"

<method name="isReadOnly"

 return="boolean"

 abstract="false"

 native="false"
@@ -49670,6 +49744,17 @@ 
 visibility="public"

>

</method>

<method name="load"

 return="boolean"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="recognize"

 return="java.util.ArrayList&lt;android.gesture.Prediction&gt;"

 abstract="false"
@@ -49713,7 +49798,7 @@ 
</method>

<method name="save"

 return="boolean"

 abstract="false"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"
@@ -49748,48 +49833,14 @@ 
<parameter name="type" type="int">

</parameter>

</method>

<field name="ORIENTATION_INVARIANT"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ORIENTATION_SENSITIVE"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SEQUENCE_INVARIANT"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SEQUENCE_SENSITIVE"

 type="int"

<field name="mStore"

 type="android.gesture.GestureStore"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

 visibility="protected"

>

</field>

</class>
@@ -50421,6 +50472,259 @@ 
>

</field>

</class>

<class name="GestureStore"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="GestureStore"

 type="android.gesture.GestureStore"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<method name="addGesture"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="entryName" type="java.lang.String">

</parameter>

<parameter name="gesture" type="android.gesture.Gesture">

</parameter>

</method>

<method name="getGestureEntries"

 return="java.util.Set&lt;java.lang.String&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getGestures"

 return="java.util.ArrayList&lt;android.gesture.Gesture&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="entryName" type="java.lang.String">

</parameter>

</method>

<method name="getOrientationStyle"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getSequenceType"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="load"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="stream" type="java.io.InputStream">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="load"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="stream" type="java.io.InputStream">

</parameter>

<parameter name="closeStream" type="boolean">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="recognize"

 return="java.util.ArrayList&lt;android.gesture.Prediction&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="gesture" type="android.gesture.Gesture">

</parameter>

</method>

<method name="removeEntry"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="entryName" type="java.lang.String">

</parameter>

</method>

<method name="removeGesture"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="entryName" type="java.lang.String">

</parameter>

<parameter name="gesture" type="android.gesture.Gesture">

</parameter>

</method>

<method name="save"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="stream" type="java.io.OutputStream">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="save"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="stream" type="java.io.OutputStream">

</parameter>

<parameter name="closeStream" type="boolean">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="setOrientationStyle"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="style" type="int">

</parameter>

</method>

<method name="setSequenceType"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="type" type="int">

</parameter>

</method>

<field name="ORIENTATION_INVARIANT"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ORIENTATION_SENSITIVE"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SEQUENCE_INVARIANT"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SEQUENCE_SENSITIVE"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="GestureStroke"

 extends="java.lang.Object"

 abstract="false"
@@ -50521,6 +50825,15 @@ 
>

</field>

</class>

<class name="Learner"

 extends="java.lang.Object"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility=""

>

</class>

<class name="LetterRecognizer"

 extends="java.lang.Object"

 abstract="false"
@@ -50529,19 +50842,17 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<method name="getLetterRecognizer"

 return="android.gesture.LetterRecognizer"

<method name="recognize"

 return="java.util.ArrayList&lt;android.gesture.Prediction&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="type" type="int">

<parameter name="gesture" type="android.gesture.Gesture">

</parameter>

</method>

<method name="recognize"
@@ -50556,20 +50867,85 @@ 
>

<parameter name="gesture" type="android.gesture.Gesture">

</parameter>

<parameter name="predictions" type="java.util.ArrayList&lt;android.gesture.Prediction&gt;">

</parameter>

</method>

<method name="recognize"

 return="java.util.ArrayList&lt;android.gesture.Prediction&gt;"

</class>

<class name="LetterRecognizers"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<method name="fromFile"

 return="android.gesture.LetterRecognizer"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="gesture" type="android.gesture.Gesture">

<parameter name="path" type="java.lang.String">

</parameter>

<parameter name="predictions" type="java.util.ArrayList&lt;android.gesture.Prediction&gt;">

</method>

<method name="fromFile"

 return="android.gesture.LetterRecognizer"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="file" type="java.io.File">

</parameter>

</method>

<method name="fromResource"

 return="android.gesture.LetterRecognizer"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="resourceId" type="int">

</parameter>

</method>

<method name="fromStream"

 return="android.gesture.LetterRecognizer"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="stream" type="java.io.InputStream">

</parameter>

</method>

<method name="fromType"

 return="android.gesture.LetterRecognizer"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="type" type="int">

</parameter>

</method>

<field name="RECOGNIZER_LATIN_LOWERCASE"

core/java/android/gesture/GestureOverlayView.java

+11 −10
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import java.util.ArrayList; 
 * @attr ref android.R.styleable#GestureOverlayView_gestureStrokeSquarenessThreshold

 * @attr ref android.R.styleable#GestureOverlayView_gestureStrokeType

 * @attr ref android.R.styleable#GestureOverlayView_gestureColor

 * @attr ref android.R.styleable#GestureOverlayView_orientation

 * @attr ref android.R.styleable#GestureOverlayView_uncertainGestureColor

 */

public class GestureOverlayView extends FrameLayout {