Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow translation should also work on non-resume state" into sc-v2-dev

Browse Source
This commit is contained in:
Joanne Chung
2021-09-10 14:51:45 +00:00
committed by Android (Google) Code Review
parent 73ad080072 5f68630b15
commit fb894242ba
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/view/translation/UiTranslationController.java
View File

@@ -110,11 +110,10 @@ public class UiTranslationController {
public void updateUiTranslationState(@UiTranslationState int state, TranslationSpec sourceSpec, public void updateUiTranslationState(@UiTranslationState int state, TranslationSpec sourceSpec,
TranslationSpec targetSpec, List<AutofillId> views, TranslationSpec targetSpec, List<AutofillId> views,
UiTranslationSpec uiTranslationSpec) { UiTranslationSpec uiTranslationSpec) {
if (!mActivity.isResumed() && (state == STATE_UI_TRANSLATION_STARTED if (mActivity.isDestroyed()) {
|| state == STATE_UI_TRANSLATION_RESUMED)) { Log.i(TAG, "Cannot update " + stateToString(state) + " for destroyed " + mActivity);
return; return;
} }
Log.i(TAG, "updateUiTranslationState state: " + stateToString(state) Log.i(TAG, "updateUiTranslationState state: " + stateToString(state)
+ (DEBUG ? (", views: " + views + ", spec: " + uiTranslationSpec) : "")); + (DEBUG ? (", views: " + views + ", spec: " + uiTranslationSpec) : ""));
synchronized (mLock) { synchronized (mLock) {
@@ -342,10 +341,8 @@ public class UiTranslationController {
*/ */
private void onVirtualViewTranslationCompleted( private void onVirtualViewTranslationCompleted(
SparseArray<LongSparseArray<ViewTranslationResponse>> translatedResult) { SparseArray<LongSparseArray<ViewTranslationResponse>> translatedResult) {
if (!mActivity.isResumed()) { if (mActivity.isDestroyed()) {
if (DEBUG) { Log.v(TAG, "onTranslationCompleted:" + mActivity + "is destroyed.");
Log.v(TAG, "onTranslationCompleted: Activity is not resumed.");
}
return; return;
} }
synchronized (mLock) { synchronized (mLock) {
@@ -393,10 +390,8 @@ public class UiTranslationController {
* The method is used to handle the translation result for non-vertual views. * The method is used to handle the translation result for non-vertual views.
*/ */
private void onTranslationCompleted(SparseArray<ViewTranslationResponse> translatedResult) { private void onTranslationCompleted(SparseArray<ViewTranslationResponse> translatedResult) {
if (!mActivity.isResumed()) { if (mActivity.isDestroyed()) {
if (DEBUG) { Log.v(TAG, "onTranslationCompleted:" + mActivity + "is destroyed.");
Log.v(TAG, "onTranslationCompleted: Activity is not resumed.");
}
return; return;
} }
final int resultCount = translatedResult.size(); final int resultCount = translatedResult.size();