Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3e3790a authored by PETER LIANG's avatar PETER LIANG Committed by Automerger Merge Worker
Browse files

Merge "Fix that when I go to display size in the settings, the largest size... 

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

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



Change-Id: I13053b63fe2ee106b558fdc40488140d200acd9c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ebab337 937821f3

src/com/android/settings/accessibility/TextReadingPreviewController.java

+6 −2
Original line number Diff line number Diff line
@@ -112,7 +112,9 @@ class TextReadingPreviewController extends BasePreferenceController implements 
        mPreviewPreference.setPreviewAdapter(pagerAdapter);

        mPreviewPreference.setCurrentItem(

                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);

    }
@@ -168,11 +170,13 @@ class TextReadingPreviewController extends BasePreferenceController implements 


    private int getPagerIndex() {

        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,

        // boolean)} behavior, here also needs the same design. In addition, please also refer to

        // the {@link #createConfig(Configuration)}.

        return mLastFontProgress * displayDataSize + mLastDisplayProgress;

        return fontSizeProgress * displayDataSize + displaySizeProgress;

    }



    private void tryCommitFontSizeConfig() {