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" /> @@ -29,7 +30,9 @@ android:key="region_zone" android:title="@string/date_time_set_timezone_title" android:summary="@string/summary_placeholder" /> - + + android:summary="@string/summary_placeholder" /> diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index cd65b225e60..ce9782d119d 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -27,7 +27,6 @@ import com.android.settings.display.AutoRotatePreferenceController; import com.android.settings.display.BrightnessLevelPreferenceController; import com.android.settings.display.CameraGesturePreferenceController; import com.android.settings.display.ColorModePreferenceController; -import com.android.settings.display.FontSizePreferenceController; import com.android.settings.display.LiftToWakePreferenceController; import com.android.settings.display.NightDisplayPreferenceController; import com.android.settings.display.NightModePreferenceController; @@ -86,7 +85,6 @@ public class DisplaySettings extends DashboardFragment { final List 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/datetime/timezone/TimeZoneInfoPreferenceController.java b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java index 0f0264f516c..71936f0d0c5 100644 --- a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java +++ b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java @@ -33,22 +33,18 @@ import com.android.settingslib.widget.FooterPreference; import java.util.Date; public class TimeZoneInfoPreferenceController extends BaseTimeZonePreferenceController { - private static final String PREFERENCE_KEY = FooterPreference.KEY_FOOTER; + private static final String PREFERENCE_KEY = FooterPreference.KEY_FOOTER; + @VisibleForTesting + Date mDate; private TimeZoneInfo mTimeZoneInfo; private final DateFormat mDateFormat; - private final Date mDate; public TimeZoneInfoPreferenceController(Context context) { - this(context, new Date()); - } - - @VisibleForTesting - TimeZoneInfoPreferenceController(Context context, Date date) { super(context, PREFERENCE_KEY); mDateFormat = DateFormat.getDateInstance(SimpleDateFormat.LONG); mDateFormat.setContext(DisplayContext.CAPITALIZATION_NONE); - mDate = date; + mDate = new Date(); } @Override diff --git a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java index 16976c256f4..edd1d256e05 100644 --- a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java +++ b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java @@ -102,15 +102,12 @@ public class TimeZoneSettings extends DashboardFragment { RegionZonePreferenceController regionZonePreferenceController = new RegionZonePreferenceController(context); regionZonePreferenceController.setOnClickListener(this::onRegionZonePreferenceClicked); - TimeZoneInfoPreferenceController timeZoneInfoPreferenceController = - new TimeZoneInfoPreferenceController(context); FixedOffsetPreferenceController fixedOffsetPreferenceController = new FixedOffsetPreferenceController(context); fixedOffsetPreferenceController.setOnClickListener(this::startFixedOffsetPicker); controllers.add(regionPreferenceController); controllers.add(regionZonePreferenceController); - controllers.add(timeZoneInfoPreferenceController); controllers.add(fixedOffsetPreferenceController); return controllers; } 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/assets/grandfather_invalid_base_preference_controller_constructor b/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor index bf2f29eade8..af67ad6766b 100644 --- a/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor +++ b/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor @@ -21,7 +21,6 @@ com.android.settings.bluetooth.BluetoothSwitchPreferenceController com.android.settings.connecteddevice.ConnectedDeviceGroupController com.android.settings.connecteddevice.SavedDeviceGroupController com.android.settings.datausage.DataUsageSummaryPreferenceController -com.android.settings.datetime.timezone.TimeZoneInfoPreferenceController com.android.settings.fuelgauge.RestrictAppPreferenceController com.android.settings.fuelgauge.batterysaver.AutoBatterySeekBarPreferenceController com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java index 2a587704e42..3c36e04c99e 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java @@ -16,6 +16,9 @@ package com.android.settings.datetime.timezone; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.spy; + import android.support.v7.preference.Preference; import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter; @@ -28,9 +31,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.Date; import java.util.Locale; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.spy; - @RunWith(SettingsRobolectricTestRunner.class) public class TimeZoneInfoPreferenceControllerTest { @@ -41,12 +41,13 @@ public class TimeZoneInfoPreferenceControllerTest { TimeZoneInfo timeZoneInfo = formatter.format("America/Los_Angeles"); TimeZoneInfoPreferenceController controller = - new TimeZoneInfoPreferenceController(RuntimeEnvironment.application, now); + new TimeZoneInfoPreferenceController(RuntimeEnvironment.application); + controller.mDate = now; controller.setTimeZoneInfo(timeZoneInfo); Preference preference = spy(new Preference(RuntimeEnvironment.application)); controller.updateState(preference); assertEquals("Uses Pacific Time (GMT-08:00). " - + "Pacific Daylight Time starts on April 26, 1970.", + + "Pacific Daylight Time starts on April 26, 1970.", preference.getTitle().toString()); } } diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java index 21ca30d7464..725313e33f2 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java @@ -16,6 +16,10 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import com.android.settings.datetime.timezone.model.TimeZoneData; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -30,10 +34,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { SettingsShadowResources.class, @@ -60,10 +60,9 @@ public class TimeZoneSettingsTest { TimeZoneSettings settings = new TimeZoneSettings(); List controllers = settings.createPreferenceControllers(RuntimeEnvironment.application); - assertThat(controllers).hasSize(4); + assertThat(controllers).hasSize(3); assertThat(controllers.get(0)).isInstanceOf(RegionPreferenceController.class); assertThat(controllers.get(1)).isInstanceOf(RegionZonePreferenceController.class); - assertThat(controllers.get(2)).isInstanceOf(TimeZoneInfoPreferenceController.class); - assertThat(controllers.get(3)).isInstanceOf(FixedOffsetPreferenceController.class); + assertThat(controllers.get(2)).isInstanceOf(FixedOffsetPreferenceController.class); } } 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]); + } +}