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

Merge "Set the settings key when the font size is changed" into udc-dev am: 0290fb1cf3

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

Change-Id: I6b600b28f428b130752e0986c490308d33bcee6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Candice Lo
2023-03-08 01:21:44 +00:00
committed by Automerger Merge Worker
parent 6170c608f2 0290fb1cf3
commit 99a0e22da2
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/accessibility/FontSizeData.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.accessibility; 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.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
@@ -50,6 +53,12 @@ final class FontSizeData extends PreviewSizeData<Float> {
@Override @Override
void commit(int currentProgress) { void commit(int currentProgress) {
final ContentResolver resolver = getContext().getContentResolver(); 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, Settings.System.putFloat(resolver, Settings.System.FONT_SCALE,
getValues().get(currentProgress)); getValues().get(currentProgress));
} }

18
tests/robotests/src/com/android/settings/accessibility/FontSizeDataTest.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.accessibility; 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 static com.google.common.truth.Truth.assertThat;
import android.content.Context; import android.content.Context;
@@ -52,4 +55,19 @@ public class FontSizeDataTest {
assertThat(currentScale).isEqualTo(mFontSizeData.getValues().get(progress)); 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);
}
} }