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

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

Merge "Add a default implementation of UiTranslationStateCallback#onResumed."... 

Merge "Add a default implementation of UiTranslationStateCallback#onResumed." into sc-dev am: d8ef2b30 am: 71ec9724

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

Change-Id: Ibd812fb26c475982c9809f3f0a4de6ddde2233ce
parents a9130f13 71ec9724

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -52964,7 +52964,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 public default 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/UiTranslationStateCallback.java

+3 −1
Original line number Diff line number Diff line
@@ -54,7 +54,9 @@ public interface UiTranslationStateCallback { 
     * 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);

    // TODO: Remove the default implementation when clients have implemented this.

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

    }



    /**

     * The UI Translation session has ended.