Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31b04f52 authored by Jeffrey Huang's avatar Jeffrey Huang Committed by Android (Google) Code Review
Browse files

Merge "Revert "Introduce CoolColorTemperaturePreferenceController""

parents 6b9f2e14 8c57f28c

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

deleted100644 → 0
+0 −100
Original line number Diff line number Diff line 
/*

 * 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.os.SystemProperties;

import android.support.annotation.VisibleForTesting;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.widget.Toast;



import com.android.settings.R;

import com.android.settingslib.development.SystemPropPoker;



public class CoolColorTemperaturePreferenceController extends

        DeveloperOptionsPreferenceController implements

        Preference.OnPreferenceChangeListener {



    private static final String COLOR_TEMPERATURE_KEY = "color_temperature";



    @VisibleForTesting

    static final String COLOR_TEMPERATURE_PROPERTY = "persist.sys.debug.color_temp";



    private SwitchPreference mPreference;



    public CoolColorTemperaturePreferenceController(Context context) {

        super(context);

    }



    @Override

    public boolean isAvailable() {

        return mContext.getResources().getBoolean(R.bool.config_enableColorTemperature);

    }



    @Override

    public String getPreferenceKey() {

        return COLOR_TEMPERATURE_KEY;

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());

    }



    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        final boolean isColorTemperatureEnabled = (Boolean) newValue;

        SystemProperties.set(COLOR_TEMPERATURE_PROPERTY,

                Boolean.toString(isColorTemperatureEnabled));

        SystemPropPoker.getInstance().poke();

        displayColorTemperatureToast();

        return true;

    }



    @Override

    public void updateState(Preference preference) {

        final boolean enableColorTemperature = SystemProperties.getBoolean(

                COLOR_TEMPERATURE_PROPERTY, false /* default */);

        mPreference.setChecked(enableColorTemperature);

    }



    @Override

    public void onDeveloperOptionsEnabled() {

        if(!isAvailable()) {

            return;

        }

        mPreference.setEnabled(true);

    }



    @Override

    public void onDeveloperOptionsDisabled() {

        if(!isAvailable()) {

            return;

        }

        SystemProperties.set(COLOR_TEMPERATURE_PROPERTY, Boolean.toString(false));

        mPreference.setChecked(false);

        mPreference.setEnabled(false);

    }



    @VisibleForTesting

    void displayColorTemperatureToast() {

        Toast.makeText(mContext, R.string.color_temperature_toast, Toast.LENGTH_LONG).show();

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        // convert to file encryption

        // picture color mode

        // webview implementation

        controllers.add(new CoolColorTemperaturePreferenceController(context));

        // cool color temperature

        // automatic system updates

        // system ui demo mode

        // quick settings developer tiles

tests/robotests/res/values-mcc999/config.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<!--

  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.

  -->



<resources>

    <!-- Whether or not new device intro suggestion is supported for this device -->

    <bool name="config_enableColorTemperature">false</bool>

</resources>
 
 No newline at end of file

tests/robotests/res/values/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,5 +17,4 @@ 
<resources>

    <!-- Whether or not new device intro suggestion is supported for this device -->

    <bool name="config_new_device_intro_suggestion_supported">true</bool>

    <bool name="config_enableColorTemperature">true</bool>

</resources>
 
 No newline at end of file

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

deleted100644 → 0
+0 −125
Original line number Diff line number Diff line 
/*

 * 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.android.settings.development.CoolColorTemperaturePreferenceController

        .COLOR_TEMPERATURE_PROPERTY;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.PreferenceScreen;



import com.android.settings.TestConfig;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;



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,

        shadows = {SettingsShadowSystemProperties.class})

public class CoolColorTemperaturePreferenceControllerTest {



    private Context mContext;

    @Mock

    private SwitchPreference mPreference;

    @Mock

    private PreferenceScreen mPreferenceScreen;

    private CoolColorTemperaturePreferenceController mController;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mController = new CoolColorTemperaturePreferenceController(mContext);

        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(

                mPreference);

        mController.displayPreference(mPreferenceScreen);

    }



    @Test

    public void onPreferenceChanged_turnOnCoolColorTemperature() {

        mController.onPreferenceChange(null, true);

        final boolean mode = SettingsShadowSystemProperties.getBoolean(

                COLOR_TEMPERATURE_PROPERTY, false);



        assertThat(mode).isTrue();

    }



    @Test

    public void onPreferenceChanged_turnOffCoolColorTemperature() {

        mController.onPreferenceChange(null, false);

        final boolean mode = SettingsShadowSystemProperties.getBoolean(

                COLOR_TEMPERATURE_PROPERTY, false);



        assertThat(mode).isFalse();

    }



    @Test

    public void updateState_preferenceShouldBeChecked() {

        SettingsShadowSystemProperties.set(COLOR_TEMPERATURE_PROPERTY,

                Boolean.toString(true));

        mController.updateState(mPreference);



        verify(mPreference).setChecked(true);

    }



    @Test

    public void updateState_preferenceShouldNotBeChecked() {

        SettingsShadowSystemProperties.set(COLOR_TEMPERATURE_PROPERTY,

                Boolean.toString(false));

        mController.updateState(mPreference);



        verify(mPreference).setChecked(false);

    }



    @Test

    public void onDeveloperOptionsDisabled_shouldDisablePreference() {

        mController.onDeveloperOptionsDisabled();



        verify(mPreference).setEnabled(false);

        verify(mPreference).setChecked(false);

    }



    @Test

    public void onDeveloperOptionsEnabled_shouldEnablePreference() {

        mController.onDeveloperOptionsEnabled();



        verify(mPreference).setEnabled(true);

    }



    @Test

    @Config(qualifiers = "mcc999")

    public void isAvailable_shouldBeFalse() {

        assertThat(mController.isAvailable()).isFalse();

    }

}