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

Commit 04d2ed14 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14444768

Change-Id: I88743a7e2ac92980dc5f0bc5a6b04e8f5dd4dbf8
parents 62794fa9 d85097d1

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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 {

























core/java/android/text/method/TranslationTransformationMethod.java



+3
−1




























Original line number
Diff line number
Diff line








@@ -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();

































core/java/android/view/translation/ViewTranslationRequest.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -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)")