From fc1590e9017f428fd8b3e38fc5e3d215998850f6 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Thu, 29 Mar 2018 12:07:02 -0700 Subject: [PATCH] Make FontSizePreferenceController slice compatible. Bug: 67997826 Test: robotests Change-Id: Iea1cff48f39e1433abea285309376876e8356c07 --- res/xml/display_settings.xml | 1 + src/com/android/settings/DisplaySettings.java | 2 - .../display/FontSizePreferenceController.java | 26 ++----- .../FontSizePreferenceControllerTest.java | 76 +++++++++++++++++++ 4 files changed, 85 insertions(+), 20 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 2645afe090b..c2f1294d0f1 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -83,6 +83,7 @@ android:key="font_size" android:title="@string/title_font_size" android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment" + settings:controller="com.android.settings.display.FontSizePreferenceController" settings:keywords="@string/keywords_display_font_size" /> controllers = new ArrayList<>(); controllers.add(new AutoRotatePreferenceController(context, lifecycle)); controllers.add(new CameraGesturePreferenceController(context)); - controllers.add(new FontSizePreferenceController(context)); controllers.add(new LiftToWakePreferenceController(context)); controllers.add(new NightDisplayPreferenceController(context)); controllers.add(new NightModePreferenceController(context)); diff --git a/src/com/android/settings/display/FontSizePreferenceController.java b/src/com/android/settings/display/FontSizePreferenceController.java index a8b4e9fec6c..3d6b6b41d31 100644 --- a/src/com/android/settings/display/FontSizePreferenceController.java +++ b/src/com/android/settings/display/FontSizePreferenceController.java @@ -16,34 +16,24 @@ package com.android.settings.display; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; -import android.support.v7.preference.Preference; import com.android.settings.R; import com.android.settings.accessibility.ToggleFontSizePreferenceFragment; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settings.core.BasePreferenceController; -public class FontSizePreferenceController extends AbstractPreferenceController implements - PreferenceControllerMixin { +public class FontSizePreferenceController extends BasePreferenceController { - private static final String KEY_FONT_SIZE = "font_size"; - - public FontSizePreferenceController(Context context) { - super(context); + public FontSizePreferenceController(Context context, String key) { + super(context, key); } @Override - public boolean isAvailable() { - return true; + public int getAvailabilityStatus() { + return AVAILABLE; } @Override - public String getPreferenceKey() { - return KEY_FONT_SIZE; - } - - @Override - public void updateState(Preference preference) { + public CharSequence getSummary() { final float currentScale = Settings.System.getFloat(mContext.getContentResolver(), Settings.System.FONT_SCALE, 1.0f); final Resources res = mContext.getResources(); @@ -51,6 +41,6 @@ public class FontSizePreferenceController extends AbstractPreferenceController i final String[] strEntryValues = res.getStringArray(R.array.entryvalues_font_size); final int index = ToggleFontSizePreferenceFragment.fontSizeValueToIndex(currentScale, strEntryValues); - preference.setSummary(entries[index]); + return entries[index]; } } diff --git a/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java new file mode 100644 index 00000000000..585b2e8de8e --- /dev/null +++ b/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.display; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; +import android.provider.Settings; + +import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RuntimeEnvironment; + +@RunWith(SettingsRobolectricTestRunner.class) +public class FontSizePreferenceControllerTest { + + private static final String TEST_KEY = "test_key"; + + private Context mContext; + private FontSizePreferenceController mController; + private String[] mFontSizeArray; + + @Before + public void setUp() { + mContext = RuntimeEnvironment.application; + mController = new FontSizePreferenceController(mContext, TEST_KEY); + mFontSizeArray = mContext.getResources().getStringArray(R.array.entries_font_size); + } + + @Test + public void isAlwaysAvailable() { + assertThat(mController.getAvailabilityStatus()) + .isEqualTo(BasePreferenceController.AVAILABLE); + } + + @Test + public void getSummary_noScale_shouldReturnDefaultSummary() { + assertThat(mController.getSummary()) + .isEqualTo(mFontSizeArray[1]); + } + + @Test + public void getSummary_smallScale_shouldReturnSmall() { + Settings.System.putFloat(mContext.getContentResolver(), + Settings.System.FONT_SCALE, 0.5f); + assertThat(mController.getSummary()) + .isEqualTo(mFontSizeArray[0]); + } + + @Test + public void getSummary_largeScale_shouldReturnLarge() { + Settings.System.putFloat(mContext.getContentResolver(), + Settings.System.FONT_SCALE, 1.5f); + assertThat(mController.getSummary()) + .isEqualTo(mFontSizeArray[3]); + } +}