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

Commit fd86960f authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "API feedback: seperate start and resume state for... 

Merge "API feedback: seperate start and resume state for UiTranslationStateCallback" into sc-dev am: bd351242

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

Change-Id: I6b33f2e4c08969931efcabac95f4433f555c5dda
parents 4411178e bd351242

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -52965,6 +52965,7 @@ package android.view.translation { 
  public interface UiTranslationStateCallback {

    method public void onFinished();

    method public void onPaused();

    method public void onResumed(@NonNull android.icu.util.ULocale, @NonNull android.icu.util.ULocale);

    method @Deprecated public void onStarted(@NonNull String, @NonNull String);

    method public default void onStarted(@NonNull android.icu.util.ULocale, @NonNull android.icu.util.ULocale);

  }

core/java/android/view/translation/UiTranslationManager.java

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ public final class UiTranslationManager { 
                    mCallback.onStarted(mSourceLocale, mTargetLocale);

                    break;

                case STATE_UI_TRANSLATION_RESUMED:

                    mCallback.onStarted(mSourceLocale, mTargetLocale);

                    mCallback.onResumed(mSourceLocale, mTargetLocale);

                    break;

                case STATE_UI_TRANSLATION_PAUSED:

                    mCallback.onPaused();

core/java/android/view/translation/UiTranslationStateCallback.java

+7 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public interface UiTranslationStateCallback { 
     * targetLocale}.

     * <p>

     * This is also called if either the requested {@code sourceLocale} or {@code targetLocale} has

     * changed; or called again after {@link #onPaused()}.

     * changed.

     */

    default void onStarted(@NonNull ULocale sourceLocale, @NonNull ULocale targetLocale) {

        onStarted(sourceLocale.getLanguage(), targetLocale.getLanguage());
@@ -50,6 +50,12 @@ public interface UiTranslationStateCallback { 
     */

    void onPaused();



    /**

     * The system is requesting that the application restore from the temporarily paused state and

     * show the content in translated language.

     */

    void onResumed(@NonNull ULocale sourceLocale, @NonNull ULocale targetLocale);



    /**

     * The UI Translation session has ended.

     */