PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix that when I go to display size in the settings, the largest size shows the smallest icons." into tm-qpr-dev am: 937821f30f am: a3e3790a73

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20067817

Change-Id: I9deea489564aea71955570ea6f125f13c60f61ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
PETER LIANG
2022-09-30 01:02:44 +00:00
committed by Automerger Merge Worker
parent 27a52f5055 a3e3790a73
commit 0039fb35cd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/accessibility/TextReadingPreviewController.java
View File

@@ -112,7 +112,9 @@ class TextReadingPreviewController extends BasePreferenceController implements
mPreviewPreference.setPreviewAdapter(pagerAdapter); mPreviewPreference.setPreviewAdapter(pagerAdapter);
mPreviewPreference.setCurrentItem( mPreviewPreference.setCurrentItem(
isLayoutRtl ? PREVIEW_SAMPLE_RES_IDS.length - 1 : FRAME_INITIAL_INDEX); isLayoutRtl ? PREVIEW_SAMPLE_RES_IDS.length - 1 : FRAME_INITIAL_INDEX);
pagerAdapter.setPreviewLayer(getPagerIndex(), LAYER_INITIAL_INDEX, final int initialPagerIndex =
mLastFontProgress * mDisplaySizeData.getValues().size() + mLastDisplayProgress;
pagerAdapter.setPreviewLayer(initialPagerIndex, LAYER_INITIAL_INDEX,
FRAME_INITIAL_INDEX, /* animate= */ false); FRAME_INITIAL_INDEX, /* animate= */ false);
} }
@@ -168,11 +170,13 @@ class TextReadingPreviewController extends BasePreferenceController implements
private int getPagerIndex() { private int getPagerIndex() {
final int displayDataSize = mDisplaySizeData.getValues().size(); final int displayDataSize = mDisplaySizeData.getValues().size();
final int fontSizeProgress = mFontSizePreference.getProgress();
final int displaySizeProgress = mDisplaySizePreference.getProgress();
// To be consistent with the {@link PreviewPagerAdapter#setPreviewLayer(int, int, int, // To be consistent with the {@link PreviewPagerAdapter#setPreviewLayer(int, int, int,
// boolean)} behavior, here also needs the same design. In addition, please also refer to // boolean)} behavior, here also needs the same design. In addition, please also refer to
// the {@link #createConfig(Configuration)}. // the {@link #createConfig(Configuration)}.
return mLastFontProgress * displayDataSize + mLastDisplayProgress; return fontSizeProgress * displayDataSize + displaySizeProgress;
} }
private void tryCommitFontSizeConfig() { private void tryCommitFontSizeConfig() {