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

Commit 9a63a626 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Rename destSpecs to targetSpecs" into sc-dev am: e3546251 

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

Change-Id: Ia187703101ac6e048851d9e8dbf7a7f81c18a717
parents e7173a7c e3546251

core/java/android/app/Activity.java

+2 −2
Original line number Diff line number Diff line
@@ -8792,11 +8792,11 @@ public class Activity extends ContextThemeWrapper 
     * @hide

     */

    public void updateUiTranslationState(int state, TranslationSpec sourceSpec,

            TranslationSpec destSpec, List<AutofillId> viewIds) {

            TranslationSpec targetSpec, List<AutofillId> viewIds) {

        if (mUiTranslationController == null) {

            mUiTranslationController = new UiTranslationController(this, getApplicationContext());

        }

        mUiTranslationController.updateUiTranslationState(state, sourceSpec, destSpec, viewIds);

        mUiTranslationController.updateUiTranslationState(state, sourceSpec, targetSpec, viewIds);

    }



    class HostCallbacks extends FragmentHostCallback<Activity> {

core/java/android/app/ActivityThread.java

+4 −4
Original line number Diff line number Diff line
@@ -1835,12 +1835,12 @@ public final class ActivityThread extends ClientTransactionHandler 


        @Override

        public void updateUiTranslationState(IBinder activityToken, int state,

                TranslationSpec sourceSpec, TranslationSpec destSpec, List<AutofillId> viewIds) {

                TranslationSpec sourceSpec, TranslationSpec targetSpec, List<AutofillId> viewIds) {

            SomeArgs args = SomeArgs.obtain();

            args.arg1 = activityToken;

            args.arg2 = state;

            args.arg3 = sourceSpec;

            args.arg4 = destSpec;

            args.arg4 = targetSpec;

            args.arg5 = viewIds;

            sendMessage(H.UPDATE_UI_TRANSLATION_STATE, args);

        }
@@ -4169,13 +4169,13 @@ public final class ActivityThread extends ClientTransactionHandler 
    }



    private void updateUiTranslationState(IBinder activityToken, int state,

            TranslationSpec sourceSpec, TranslationSpec destSpec, List<AutofillId> viewIds) {

            TranslationSpec sourceSpec, TranslationSpec targetSpec, List<AutofillId> viewIds) {

        final ActivityClientRecord r = mActivities.get(activityToken);

        if (r == null) {

            Log.w(TAG, "updateUiTranslationState(): no activity for " + activityToken);

            return;

        }

        r.activity.updateUiTranslationState(state, sourceSpec, destSpec, viewIds);

        r.activity.updateUiTranslationState(state, sourceSpec, targetSpec, viewIds);

    }



    private static final ThreadLocal<Intent> sCurrentBroadcastIntent = new ThreadLocal<Intent>();

core/java/android/app/IApplicationThread.aidl

+1 −1
Original line number Diff line number Diff line
@@ -160,5 +160,5 @@ oneway interface IApplicationThread { 
            IUiAutomationConnection instrumentationUiConnection,

            in ApplicationInfo targetInfo);

    void updateUiTranslationState(IBinder activityToken, int state, in TranslationSpec sourceSpec,

            in TranslationSpec destSpec, in List<AutofillId> viewIds);

            in TranslationSpec targetSpec, in List<AutofillId> viewIds);

}

core/java/android/service/translation/TranslationService.java

+0 −1
Original line number Diff line number Diff line
@@ -283,6 +283,5 @@ public abstract class TranslationService extends Service { 
                        resultReceiver.send(TranslationManager.STATUS_SYNC_CALL_SUCCESS, bundle);

                    }

                });



    }

}

core/java/android/view/translation/TranslationResponse.java

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public final class TranslationResponse implements Parcelable { 
        /**

         * Adds {@link TranslationResponseValue} to be translated. The input

         * TranslationResponseValue format should match those provided by the

         * {@link android.view.translation.Translator}'s destSpec.

         * {@link android.view.translation.Translator}'s targetSpec.

         *

         * @param value the translated value.

         * @return this Builder.
@@ -109,7 +109,7 @@ public final class TranslationResponse implements Parcelable { 
        /**

         * Sets the list of {@link ViewTranslationResponse} to be translated. The input

         * ViewTranslationResponse contains {@link TranslationResponseValue}s whose  format should

         * match those provided by the {@link android.view.translation.Translator}'s destSpec.

         * match those provided by the {@link android.view.translation.Translator}'s targetSpec.

         *

         * @param response the translated response.

         * @return this Builder.