Merge changes I0fde4f80,Iea1cff48 into pi-dev am: 0ae4204f54

am: 4663e6e52a

Change-Id: I4cff256a0707543d8fd782ba7b3889c5d181ddff

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

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

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

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]);
+    }
+}