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

Merge change 21038 into donut

Browse Source 
* changes:
  Propagate info about whether a "call" command was issued in RecognitionResult.
This commit is contained in:
Android (Google) Code Review
2009-08-12 18:05:50 -07:00
parent 6550076f6c 840d0f528f
commit 370e1f7439
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/speech/RecognitionResult.java
View File

@@ -60,9 +60,11 @@ public class RecognitionResult implements Parcelable {
* *
* @param contact the contact name. * @param contact the contact name.
* @param phoneType the phone type. * @param phoneType the phone type.
* @param callAction whether this result included a command to "call", or just the contact name.
*/ */
public static RecognitionResult newContactResult(String contact, int phoneType) { public static RecognitionResult newContactResult(String contact, int phoneType,
return new RecognitionResult(CONTACT_RESULT, contact, phoneType); boolean callAction) {
return new RecognitionResult(CONTACT_RESULT, contact, phoneType, callAction);
} }
/** /**
@@ -112,8 +114,16 @@ public class RecognitionResult implements Parcelable {
*/ */
public final String mUrl; public final String mUrl;
/** Phone number type. This is valid only when mResultType == CONTACT_RESULT */ /**
* Phone number type. This is valid only when mResultType == CONTACT_RESULT.
*/
public final int mPhoneType; public final int mPhoneType;
/**
* Whether a contact recognition result included a command to "call". This is valid only
* when mResultType == CONTACT_RESULT.
*/
public final boolean mCallAction;
private RecognitionResult(int type, String query, String html, String url) { private RecognitionResult(int type, String query, String html, String url) {
mResultType = type; mResultType = type;
@@ -121,14 +131,16 @@ public class RecognitionResult implements Parcelable {
mHtml = html; mHtml = html;
mUrl = url; mUrl = url;
mPhoneType = -1; mPhoneType = -1;
mCallAction = false;
} }
private RecognitionResult(int type, String query, int at) { private RecognitionResult(int type, String query, int phoneType, boolean callAction) {
mResultType = type; mResultType = type;
mText = query; mText = query;
mPhoneType = at; mPhoneType = phoneType;
mHtml = null; mHtml = null;
mUrl = null; mUrl = null;
mCallAction = callAction;
} }
private RecognitionResult(Parcel in) { private RecognitionResult(Parcel in) {
@@ -137,6 +149,7 @@ public class RecognitionResult implements Parcelable {
mHtml= in.readString(); mHtml= in.readString();
mUrl= in.readString(); mUrl= in.readString();
mPhoneType = in.readInt(); mPhoneType = in.readInt();
mCallAction = (in.readInt() == 1);
} }
public void writeToParcel(Parcel out, int flags) { public void writeToParcel(Parcel out, int flags) {
@@ -145,6 +158,7 @@ public class RecognitionResult implements Parcelable {
out.writeString(mHtml); out.writeString(mHtml);
out.writeString(mUrl); out.writeString(mUrl);
out.writeInt(mPhoneType); out.writeInt(mPhoneType);
out.writeInt(mCallAction ? 1 : 0);
} }