Merge "Introduce SecondaryDisplaysPreferenceController"

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

@@ -391,7 +391,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         controllers.add(new WindowAnimationScalePreferenceController(context));
         controllers.add(new TransitionAnimationScalePreferenceController(context));
         controllers.add(new AnimatorDurationScalePreferenceController(context));
-        // simulate secondary displays
+        controllers.add(new SecondaryDisplayPreferenceController(context));
         // smallest width
         controllers.add(new ForceGpuRenderingPreferenceController(context));
         controllers.add(new GpuViewUpdatesPreferenceController(context));

src/com/android/settings/development/SecondaryDisplayPreferenceController.java

@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2017 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.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class SecondaryDisplayPreferenceController extends
+        DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String OVERLAY_DISPLAY_DEVICES_KEY = "overlay_display_devices";
+
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private ListPreference mPreference;
+
+    public SecondaryDisplayPreferenceController(Context context) {
+        super(context);
+
+        mListValues = context.getResources().getStringArray(R.array.overlay_display_devices_values);
+        mListSummaries = context.getResources().getStringArray(
+                R.array.overlay_display_devices_entries);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return OVERLAY_DISPLAY_DEVICES_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeSecondaryDisplayDevicesOption(newValue.toString());
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateSecondaryDisplayDevicesOptions();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeSecondaryDisplayDevicesOption(null);
+        mPreference.setEnabled(false);
+    }
+
+    private void updateSecondaryDisplayDevicesOptions() {
+        final String value = Settings.Global.getString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES);
+        int index = 0; // default
+        for (int i = 0; i < mListValues.length; i++) {
+            if (TextUtils.equals(value, mListValues[i])) {
+                index = i;
+                break;
+            }
+        }
+        mPreference.setValue(mListValues[index]);
+        mPreference.setSummary(mListSummaries[index]);
+    }
+
+    private void writeSecondaryDisplayDevicesOption(String newValue) {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES, newValue);
+        updateSecondaryDisplayDevicesOptions();
+    }
+}

tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java

@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2017 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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SecondaryDisplayPreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    /**
+     * 0: None
+     * 1: 480p
+     * 2: 480p (secure)
+     * 3: 720p
+     * 4: 720p (secure)
+     * 5: 1080p
+     * 6: 1080p (secure)
+     * 7: 4K
+     * 8: 4K (secure)
+     * 9: 4K (upscaled)
+     * 10: 4K (upscaled, secure)
+     * 11: 720p, 1080p (dual screen)
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private SecondaryDisplayPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(
+                R.array.overlay_display_devices_values);
+        mListSummaries = mContext.getResources().getStringArray(
+                R.array.overlay_display_devices_entries);
+        mController = new SecondaryDisplayPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_set480p_shouldEnable480p() {
+        mController.onPreferenceChange(mPreference, mListValues[1]);
+
+        final String value = Settings.Global.getString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES);
+        assertThat(value).isEqualTo(mListValues[1]);
+    }
+
+    @Test
+    public void onPreferenceChange_set720p_shouldEnable720p() {
+        mController.onPreferenceChange(mPreference, mListValues[3]);
+
+        final String value = Settings.Global.getString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES);
+        assertThat(value).isEqualTo(mListValues[3]);
+    }
+
+    @Test
+    public void updateState_set480p_shouldSetPreferenceTo480p() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES, mListValues[1]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[1]);
+        verify(mPreference).setSummary(mListSummaries[1]);
+    }
+
+    @Test
+    public void updateState_set720p_shouldSetPreferenceTo720p() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES, mListValues[3]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[3]);
+        verify(mPreference).setSummary(mListSummaries[3]);
+    }
+
+    @Test
+    public void updateState_nothingSet_shouldSetDefaultToNone() {
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(mListSummaries[0]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreferenceAndSetToNone() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final String value = Settings.Global.getString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES);
+        assertThat(value).isNull();
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(mListSummaries[0]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}