Merge change 21055 into donut
* changes:
Lock in final resource identifiers.
diff --git a/core/java/android/speech/RecognitionResult.java b/core/java/android/speech/RecognitionResult.java
index 8d031fc..978106b 100644
--- a/core/java/android/speech/RecognitionResult.java
+++ b/core/java/android/speech/RecognitionResult.java
@@ -60,9 +60,11 @@
*
* @param contact the contact name.
* @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) {
- return new RecognitionResult(CONTACT_RESULT, contact, phoneType);
+ public static RecognitionResult newContactResult(String contact, int phoneType,
+ boolean callAction) {
+ return new RecognitionResult(CONTACT_RESULT, contact, phoneType, callAction);
}
/**
@@ -112,8 +114,16 @@
*/
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;
+
+ /**
+ * 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) {
mResultType = type;
@@ -121,14 +131,16 @@
mHtml = html;
mUrl = url;
mPhoneType = -1;
+ mCallAction = false;
}
- private RecognitionResult(int type, String query, int at) {
+ private RecognitionResult(int type, String query, int phoneType, boolean callAction) {
mResultType = type;
mText = query;
- mPhoneType = at;
+ mPhoneType = phoneType;
mHtml = null;
mUrl = null;
+ mCallAction = callAction;
}
private RecognitionResult(Parcel in) {
@@ -137,6 +149,7 @@
mHtml= in.readString();
mUrl= in.readString();
mPhoneType = in.readInt();
+ mCallAction = (in.readInt() == 1);
}
public void writeToParcel(Parcel out, int flags) {
@@ -145,6 +158,7 @@
out.writeString(mHtml);
out.writeString(mUrl);
out.writeInt(mPhoneType);
+ out.writeInt(mCallAction ? 1 : 0);
}
diff --git a/core/res/res/drawable/sym_def_app_icon.png b/core/res/res/drawable/sym_def_app_icon.png
index 75024841..8be3b54 100644
--- a/core/res/res/drawable/sym_def_app_icon.png
+++ b/core/res/res/drawable/sym_def_app_icon.png
Binary files differ
