Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 2748 into donut

Browse Source 
* changes:
  Fix the build.
This commit is contained in:
Android (Google) Code Review
2009-05-29 15:03:25 -07:00
parent b61ae35125 8d78756c16
commit 2d75410f20
2 changed files with 446 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

494
api/current.xml
View File

@@ -46404,10 +46404,75 @@
> >
</field> </field>
</class> </class>
<class name="GestureLibrary" <class name="GestureLibraries"
extends="java.lang.Object" extends="java.lang.Object"
abstract="false" abstract="false"
static="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" final="false"
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
@@ -46417,10 +46482,8 @@
static="false" static="false"
final="false" final="false"
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="protected"
> >
<parameter name="path" type="java.lang.String">
</parameter>
</constructor> </constructor>
<method name="addGesture" <method name="addGesture"
return="void" return="void"
@@ -46461,6 +46524,17 @@
<parameter name="entryName" type="java.lang.String"> <parameter name="entryName" type="java.lang.String">
</parameter> </parameter>
</method> </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" <method name="getOrientationStyle"
return="int" return="int"
abstract="false" abstract="false"
@@ -46483,7 +46557,7 @@
visibility="public" visibility="public"
> >
</method> </method>
<method name="load" <method name="isReadOnly"
return="boolean" return="boolean"
abstract="false" abstract="false"
native="false" native="false"
@@ -46494,6 +46568,17 @@
visibility="public" visibility="public"
> >
</method> </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" <method name="recognize"
return="java.util.ArrayList&lt;android.gesture.Prediction&gt;" return="java.util.ArrayList&lt;android.gesture.Prediction&gt;"
abstract="false" abstract="false"
@@ -46537,7 +46622,7 @@
</method> </method>
<method name="save" <method name="save"
return="boolean" return="boolean"
abstract="false" abstract="true"
native="false" native="false"
synchronized="false" synchronized="false"
static="false" static="false"
@@ -46572,48 +46657,14 @@
<parameter name="type" type="int"> <parameter name="type" type="int">
</parameter> </parameter>
</method> </method>
<field name="ORIENTATION_INVARIANT" <field name="mStore"
type="int" type="android.gesture.GestureStore"
transient="false" transient="false"
volatile="false" volatile="false"
value="1" static="false"
static="true"
final="true" final="true"
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="protected"
>
</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> </field>
</class> </class>
@@ -47245,6 +47296,259 @@
> >
</field> </field>
</class> </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" <class name="GestureStroke"
extends="java.lang.Object" extends="java.lang.Object"
abstract="false" abstract="false"
@@ -47345,6 +47649,15 @@
> >
</field> </field>
</class> </class>
<class name="Learner"
extends="java.lang.Object"
abstract="true"
static="false"
final="false"
deprecated="not deprecated"
visibility=""
>
</class>
<class name="LetterRecognizer" <class name="LetterRecognizer"
extends="java.lang.Object" extends="java.lang.Object"
abstract="false" abstract="false"
@@ -47353,21 +47666,6 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<method name="getLetterRecognizer"
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>
<method name="recognize" <method name="recognize"
return="java.util.ArrayList&lt;android.gesture.Prediction&gt;" return="java.util.ArrayList&lt;android.gesture.Prediction&gt;"
abstract="false" abstract="false"
@@ -47396,6 +47694,84 @@
<parameter name="predictions" type="java.util.ArrayList&lt;android.gesture.Prediction&gt;"> <parameter name="predictions" type="java.util.ArrayList&lt;android.gesture.Prediction&gt;">
</parameter> </parameter>
</method> </method>
</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="true"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="path" type="java.lang.String">
</parameter>
</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" <field name="RECOGNIZER_LATIN_LOWERCASE"
type="int" type="int"
transient="false" transient="false"

1
core/java/android/gesture/GestureOverlayView.java
View File

@@ -47,6 +47,7 @@ import java.util.ArrayList;
* @attr ref android.R.styleable#GestureOverlayView_gestureStrokeSquarenessThreshold * @attr ref android.R.styleable#GestureOverlayView_gestureStrokeSquarenessThreshold
* @attr ref android.R.styleable#GestureOverlayView_gestureStrokeType * @attr ref android.R.styleable#GestureOverlayView_gestureStrokeType
* @attr ref android.R.styleable#GestureOverlayView_gestureColor * @attr ref android.R.styleable#GestureOverlayView_gestureColor
* @attr ref android.R.styleable#GestureOverlayView_orientation
* @attr ref android.R.styleable#GestureOverlayView_uncertainGestureColor * @attr ref android.R.styleable#GestureOverlayView_uncertainGestureColor
*/ */
public class GestureOverlayView extends FrameLayout { public class GestureOverlayView extends FrameLayout {