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

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

Merge "Introduce FreeformWindowsPreferenceController"

parents 82f8a3de de895f38

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

+1 −0
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        // inactive apps

        controllers.add(new AllowAppsOnExternalPreferenceController(context));

        controllers.add(new ResizableActivityPreferenceController(context));

        controllers.add(new FreeformWindowsPreferenceController(context));

        controllers.add(new ShortcutManagerThrottlingPreferenceController(context));

        return controllers;

    }

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

0 → 100644
+100 −0
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.Build;

import android.provider.Settings;

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.text.TextUtils;



import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;



public class FreeformWindowsPreferenceController extends

        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,

        PreferenceControllerMixin {



    private static final String ENABLE_FREEFORM_SUPPORT_KEY = "enable_freeform_support";



    @VisibleForTesting

    static final int SETTING_VALUE_OFF = 0;

    @VisibleForTesting

    static final int SETTING_VALUE_ON = 1;

    @VisibleForTesting

    static final String USER_BUILD_TYPE = "user";



    private SwitchPreference mPreference;



    public FreeformWindowsPreferenceController(Context context) {

        super(context);

    }



    @Override

    public boolean isAvailable() {

        return !TextUtils.equals(USER_BUILD_TYPE, getBuildType());

    }



    @Override

    public String getPreferenceKey() {

        return ENABLE_FREEFORM_SUPPORT_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 isEnabled = (Boolean) newValue;

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT,

                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);

        return true;

    }



    @Override

    public void updateState(Preference preference) {

        final int mode = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, SETTING_VALUE_OFF);

        mPreference.setChecked(mode != SETTING_VALUE_OFF);

    }



    @Override

    protected void onDeveloperOptionsSwitchEnabled() {

        mPreference.setEnabled(true);

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, SETTING_VALUE_OFF);

        mPreference.setEnabled(false);

        mPreference.setChecked(false);

    }



    @VisibleForTesting

    String getBuildType() {

        return Build.TYPE;

    }

}

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

0 → 100644
+140 −0
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.FreeformWindowsPreferenceController

        .SETTING_VALUE_OFF;

import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_ON;

import static com.android.settings.development.FreeformWindowsPreferenceController.USER_BUILD_TYPE;



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



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.provider.Settings;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.PreferenceScreen;



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 FreeformWindowsPreferenceControllerTest {



    private static final String ENG_BUILD_TYPE = "eng";



    @Mock

    private SwitchPreference mPreference;

    @Mock

    private PreferenceScreen mScreen;



    private Context mContext;

    private FreeformWindowsPreferenceController mController;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mController = new FreeformWindowsPreferenceController(mContext);

        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);

        mController.displayPreference(mScreen);

    }



    @Test

    public void isAvailable_engBuild_shouldBeTrue() {

        mController = spy(mController);

        doReturn(ENG_BUILD_TYPE).when(mController).getBuildType();



        assertThat(mController.isAvailable()).isTrue();

    }



    @Test

    public void isAvaiable_userBuild_shouldBeFalse() {

        mController = spy(mController);

        doReturn(USER_BUILD_TYPE).when(mController).getBuildType();



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

    }



    @Test

    public void onPreferenceChange_switchEnabled_shouldEnableFreeformWindows() {

        mController.onPreferenceChange(mPreference, true /* new value */);



        final int mode = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, -1 /* default */);

        assertThat(mode).isEqualTo(SETTING_VALUE_ON);

    }



    @Test

    public void onPreferenceChange_switchDisabled_shouldDisableFreeformWindows() {

        mController.onPreferenceChange(mPreference, false /* new value */);



        final int mode = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, -1 /* default */);

        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);

    }



    @Test

    public void updateState_settingEnabled_preferenceShouldBeChecked() {

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, SETTING_VALUE_ON);



        mController.updateState(mPreference);



        verify(mPreference).setChecked(true);

    }



    @Test

    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, SETTING_VALUE_OFF);



        mController.updateState(mPreference);



        verify(mPreference).setChecked(false);

    }



    @Test

    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {

        mController.onDeveloperOptionsSwitchEnabled();



        verify(mPreference).setEnabled(true);

    }



    @Test

    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {

        mController.onDeveloperOptionsSwitchDisabled();



        final int mode = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, -1 /* default */);

        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);

        verify(mPreference).setEnabled(false);

    }

}