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

Merge "Add android: to text constant to prevent namespace conflicts." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-11 12:50:54 +00:00
committed by Android (Google) Code Review
parent f162726eb3 b9cdc84c87
commit d85097d1ad
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -52988,7 +52988,7 @@ package android.view.translation {
method @NonNull public android.view.translation.TranslationRequestValue getValue(@NonNull String);
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.view.translation.ViewTranslationRequest> CREATOR;
field public static final String ID_TEXT = "text";
field public static final String ID_TEXT = "android:text";
}
public static final class ViewTranslationRequest.Builder {

4
core/java/android/text/method/TranslationTransformationMethod.java
View File

@@ -22,6 +22,7 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.view.translation.TranslationResponseValue;
import android.view.translation.ViewTranslationRequest;
import android.view.translation.ViewTranslationResponse;
import android.widget.TextView;
@@ -67,7 +68,8 @@ public class TranslationTransformationMethod implements TransformationMethod2 {
Log.w(TAG, "Caller did not enable length changes; not transforming to translated text");
return source;
}
TranslationResponseValue value = mTranslationResponse.getValue("text");
TranslationResponseValue value = mTranslationResponse.getValue(
ViewTranslationRequest.ID_TEXT);
CharSequence translatedText;
if (value.getStatusCode() == TranslationResponseValue.STATUS_SUCCESS) {
translatedText = value.getText();

4
core/java/android/view/translation/ViewTranslationRequest.java
View File

@@ -43,7 +43,7 @@ public final class ViewTranslationRequest implements Parcelable {
* Constant id for the default view text to be translated. This is used by
* {@link Builder#setValue(String, TranslationRequestValue)}.
*/
public static final String ID_TEXT = "text";
public static final String ID_TEXT = "android:text";
/**
* The {@link AutofillId} of the view associated with this request.
@@ -303,7 +303,7 @@ public final class ViewTranslationRequest implements Parcelable {
};
@DataClass.Generated(
time = 1617119791798L,
time = 1620259482911L,
codegenVersion = "1.0.23",
sourceFile = "frameworks/base/core/java/android/view/translation/ViewTranslationRequest.java",
inputSignatures = "public static final java.lang.String ID_TEXT\nprivate final @android.annotation.NonNull android.view.autofill.AutofillId mAutofillId\nprivate final @android.annotation.NonNull @com.android.internal.util.DataClass.PluralOf(\"translationRequestValue\") java.util.Map<java.lang.String,android.view.translation.TranslationRequestValue> mTranslationRequestValues\npublic @android.annotation.NonNull android.view.translation.TranslationRequestValue getValue(java.lang.String)\npublic @android.annotation.NonNull java.util.Set<java.lang.String> getKeys()\npublic @android.annotation.NonNull android.view.autofill.AutofillId getAutofillId()\nprivate static java.util.Map<java.lang.String,android.view.translation.TranslationRequestValue> defaultTranslationRequestValues()\nclass ViewTranslationRequest extends java.lang.Object implements [android.os.Parcelable]\nprivate @android.annotation.NonNull android.view.autofill.AutofillId mAutofillId\nprivate @android.annotation.NonNull java.util.Map<java.lang.String,android.view.translation.TranslationRequestValue> mTranslationRequestValues\nprivate long mBuilderFieldsSet\npublic @android.annotation.SuppressLint @android.annotation.NonNull android.view.translation.ViewTranslationRequest.Builder setValue(java.lang.String,android.view.translation.TranslationRequestValue)\npublic @android.annotation.NonNull android.view.translation.ViewTranslationRequest build()\n android.view.translation.ViewTranslationRequest.Builder setTranslationRequestValues(java.util.Map<java.lang.String,android.view.translation.TranslationRequestValue>)\nprivate void checkNotUsed()\nclass Builder extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genBuilder=false, genToString=true, genEqualsHashCode=true, genGetters=false, genHiddenConstructor=true)")