From f78ddfad56846338cb0296873161cdcf5b90f354 Mon Sep 17 00:00:00 2001 From: Peter Liang Date: Fri, 23 Dec 2022 11:22:00 +0800 Subject: [PATCH] Fix overlapping icons on display size page. Action: Update the correct state over cache value. Bug: 258268965 Test: manual test Change-Id: I5ce4b847a2d8229ab2f9188cab369a43b55afbe0 --- .../settings/accessibility/TextReadingPreviewController.java | 2 ++ .../settings/accessibility/TextReadingPreviewPreference.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/com/android/settings/accessibility/TextReadingPreviewController.java b/src/com/android/settings/accessibility/TextReadingPreviewController.java index 8fa8dc782c2..ffa156be01a 100644 --- a/src/com/android/settings/accessibility/TextReadingPreviewController.java +++ b/src/com/android/settings/accessibility/TextReadingPreviewController.java @@ -112,8 +112,10 @@ class TextReadingPreviewController extends BasePreferenceController implements mPreviewPreference.setPreviewAdapter(pagerAdapter); mPreviewPreference.setCurrentItem( isLayoutRtl ? PREVIEW_SAMPLE_RES_IDS.length - 1 : FRAME_INITIAL_INDEX); + final int initialPagerIndex = mLastFontProgress * mDisplaySizeData.getValues().size() + mLastDisplayProgress; + mPreviewPreference.setLastLayerIndex(initialPagerIndex); pagerAdapter.setPreviewLayer(initialPagerIndex, LAYER_INITIAL_INDEX, FRAME_INITIAL_INDEX, /* animate= */ false); } diff --git a/src/com/android/settings/accessibility/TextReadingPreviewPreference.java b/src/com/android/settings/accessibility/TextReadingPreviewPreference.java index cef6f25694f..c4a948935ff 100644 --- a/src/com/android/settings/accessibility/TextReadingPreviewPreference.java +++ b/src/com/android/settings/accessibility/TextReadingPreviewPreference.java @@ -105,6 +105,10 @@ public class TextReadingPreviewPreference extends Preference { } } + void setLastLayerIndex(int lastLayerIndex) { + mLastLayerIndex = lastLayerIndex; + } + int getCurrentItem() { return mCurrentItem; }