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

Commit 0290fb1c authored by Candice Lo's avatar Candice Lo Committed by Android (Google) Code Review
Browse files

Merge "Set the settings key when the font size is changed" into udc-dev

parents 9e2e47c5 dbaea0f1

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

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.settings.accessibility;



import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;

import static com.android.settings.accessibility.AccessibilityUtil.State.ON;



import android.content.ContentResolver;

import android.content.Context;

import android.content.res.Resources;
@@ -50,6 +53,12 @@ final class FontSizeData extends PreviewSizeData<Float> { 
    @Override

    void commit(int currentProgress) {

        final ContentResolver resolver = getContext().getContentResolver();

        if (Settings.Secure.getInt(resolver,

                Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED,

                /* def= */ OFF) != ON) {

            Settings.Secure.putInt(resolver,

                    Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED, ON);

        }

        Settings.System.putFloat(resolver, Settings.System.FONT_SCALE,

                getValues().get(currentProgress));

    }

tests/robotests/src/com/android/settings/accessibility/FontSizeDataTest.java

+18 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.settings.accessibility;



import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;

import static com.android.settings.accessibility.AccessibilityUtil.State.ON;



import static com.google.common.truth.Truth.assertThat;



import android.content.Context;
@@ -52,4 +55,19 @@ public class FontSizeDataTest { 


        assertThat(currentScale).isEqualTo(mFontSizeData.getValues().get(progress));

    }



    @Test

    public void commit_fontScalingHasBeenChangedIsOn() {

        final int progress = 3;

        Settings.Secure.putInt(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED, OFF);



        mFontSizeData.commit(progress);

        final int currentSettings = Settings.Secure.getInt(

                mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED,

                /* def= */ OFF);



        assertThat(currentSettings).isEqualTo(ON);

    }

}