From 8f1d5a146914d9da728a420dc81439fb93ea33c5 Mon Sep 17 00:00:00 2001
From: Peter Liang <peterliang@google.com>
Date: Fri, 23 Dec 2022 11:45:23 +0800
Subject: [PATCH] Fix that the preview should keep the same layer when
 switching the screen on/off.

Action:
Move the restore state action to the previous cycle.

Bug: 259213786
Test: manual test
Change-Id: Iff49d3774824e7cfe3912a4d18fd535083cf923a
---
 .../accessibility/TextReadingPreferenceFragment.java   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java b/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
index 22bef288282..58106a3f2e1 100644
--- a/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
@@ -67,7 +67,6 @@ public class TextReadingPreferenceFragment extends DashboardFragment {
 
     private FontWeightAdjustmentPreferenceController mFontWeightAdjustmentController;
     private TextReadingPreviewController mPreviewController;
-    private int mLastPreviewIndex = UNKNOWN_INDEX;
     private int mEntryPoint = EntryPoint.UNKNOWN_ENTRY;
 
     /**
@@ -110,7 +109,10 @@ public class TextReadingPreferenceFragment extends DashboardFragment {
             }
 
             if (savedInstanceState.containsKey(LAST_PREVIEW_INDEX)) {
-                mLastPreviewIndex = savedInstanceState.getInt(LAST_PREVIEW_INDEX);
+                final int lastPreviewIndex = savedInstanceState.getInt(LAST_PREVIEW_INDEX);
+                if (lastPreviewIndex != UNKNOWN_INDEX) {
+                    mPreviewController.setCurrentItem(lastPreviewIndex);
+                }
             }
         }
     }
@@ -220,10 +222,6 @@ public class TextReadingPreferenceFragment extends DashboardFragment {
     @Override
     public void onStart() {
         super.onStart();
-
-        if (mLastPreviewIndex != UNKNOWN_INDEX) {
-            mPreviewController.setCurrentItem(mLastPreviewIndex);
-        }
     }
 
     protected boolean isCallingFromAnythingElseEntryPoint() {