From 8e9d678ff0c6295e2bda348a9f6d43aa0307d0d5 Mon Sep 17 00:00:00 2001
From: Joanne Chung <joannechung@google.com>
Date: Mon, 3 May 2021 20:46:35 +0800
Subject: [PATCH] API feedback: seperate start and resume state for
 UiTranslationStateCallback

Bug: 185274258
Test: manual
Test: atest android.translation.cts.UiTranslationManagerTest

Change-Id: Ic2246a9ef64a214ce39e187056a9add56e616d1a
---
 core/api/current.txt                                      | 1 +
 .../android/view/translation/UiTranslationManager.java    | 2 +-
 .../view/translation/UiTranslationStateCallback.java      | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index b257f5eea9d7f..1b32948b0b0e4 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -52956,6 +52956,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);
   }
diff --git a/core/java/android/view/translation/UiTranslationManager.java b/core/java/android/view/translation/UiTranslationManager.java
index 7726086a47876..882833d20e3c8 100644
--- a/core/java/android/view/translation/UiTranslationManager.java
+++ b/core/java/android/view/translation/UiTranslationManager.java
@@ -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();
diff --git a/core/java/android/view/translation/UiTranslationStateCallback.java b/core/java/android/view/translation/UiTranslationStateCallback.java
index e60eecd970543..968cbdcbd69d3 100644
--- a/core/java/android/view/translation/UiTranslationStateCallback.java
+++ b/core/java/android/view/translation/UiTranslationStateCallback.java
@@ -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.
      */