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

Commit 99312bc9 authored by jeffreyhuang's avatar jeffreyhuang
Browse files

Introduce StrictModePreferenceController 

 - Create new StrictModePreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I28d70fd5c82de2427747625b5f06f79d3808a145
parent d43f656e

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

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        // simulate color space

        // set gpu renderer

        // disable usb audio routing

        // strict mode enabled

        controllers.add(new StrictModePreferenceController(context));

        // profile gpu rendering

        // don't keep activities

        // background process limit

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

0 → 100644
+101 −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.RemoteException;

import android.os.ServiceManager;

import android.os.StrictMode;

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

import android.view.IWindowManager;



public class StrictModePreferenceController extends DeveloperOptionsPreferenceController implements

        Preference.OnPreferenceChangeListener {



    private static final String STRICT_MODE_KEY = "strict_mode";

    private static final String WINDOW_MANAGER_KEY = "window";



    @VisibleForTesting

    static final String STRICT_MODE_ENABLED = "1";

    @VisibleForTesting

    static final String STRICT_MODE_DISABLED = "";



    private final IWindowManager mWindowManager;



    private SwitchPreference mPreference;



    public StrictModePreferenceController(Context context) {

        super(context);



        mWindowManager = IWindowManager.Stub.asInterface(

                ServiceManager.getService(WINDOW_MANAGER_KEY));

    }



    @Override

    public String getPreferenceKey() {

        return STRICT_MODE_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;

        writeStrictModeVisualOptions(isEnabled);

        return true;

    }



    @Override

    public void updateState(Preference preference) {

        mPreference.setChecked(isStrictModeEnabled());

    }



    @Override

    protected void onDeveloperOptionsSwitchEnabled() {

        mPreference.setEnabled(true);

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        writeStrictModeVisualOptions(false);

        mPreference.setEnabled(false);

        mPreference.setChecked(false);

    }



    private boolean isStrictModeEnabled() {

        return SystemProperties.getBoolean(StrictMode.VISUAL_PROPERTY, false /* default */);

    }



    private void writeStrictModeVisualOptions(boolean isEnabled) {

        try {

            mWindowManager.setStrictModeVisualIndicatorPreference(

                    isEnabled ? STRICT_MODE_ENABLED : STRICT_MODE_DISABLED);

        } catch (RemoteException e) {

            // intentional no-op

        }

    }

}

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

0 → 100644
+127 −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.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.os.RemoteException;

import android.os.StrictMode;

import android.os.SystemProperties;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.PreferenceScreen;

import android.view.IWindowManager;



import com.android.settings.TestConfig;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

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



import org.junit.After;

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;

import org.robolectric.util.ReflectionHelpers;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION,

        shadows = {SettingsShadowSystemProperties.class})

public class StrictModePreferenceControllerTest {



    @Mock

    private IWindowManager mWindowManager;

    @Mock

    private PreferenceScreen mScreen;

    @Mock

    private SwitchPreference mPreference;



    private Context mContext;

    private StrictModePreferenceController mController;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mController = new StrictModePreferenceController(mContext);

        ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager);

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

        mController.displayPreference(mScreen);

    }



    @After

    public void tearDown() {

        SettingsShadowSystemProperties.clear();

    }



    @Test

    public void onPreferenceChange_settingEnabled_shouldTurnOnStrictMode() throws RemoteException {

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



        verify(mWindowManager).setStrictModeVisualIndicatorPreference(

                StrictModePreferenceController.STRICT_MODE_ENABLED);

    }



    @Test

    public void onPreferenceChange_settingDisabled_shouldTurnOffStrictMode()

            throws RemoteException {

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



        verify(mWindowManager).setStrictModeVisualIndicatorPreference(

                StrictModePreferenceController.STRICT_MODE_DISABLED);

    }



    @Test

    public void updateState_settingEnabled_preferenceShouldBeChecked() {

        SystemProperties.set(StrictMode.VISUAL_PROPERTY, Boolean.toString(false));

        mController.updateState(mPreference);



        verify(mPreference).setChecked(false);

    }



    @Test

    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {

        SystemProperties.set(StrictMode.VISUAL_PROPERTY, Boolean.toString(true));

        mController.updateState(mPreference);



        verify(mPreference).setChecked(true);

    }



    @Test

    public void onDeveloperOptionsSwitchDisabled_shouldTurnOffPreference() {

        mController.onDeveloperOptionsSwitchDisabled();

        final boolean isEnabled = SystemProperties.getBoolean(StrictMode.VISUAL_PROPERTY,

                false /* default */);



        assertThat(isEnabled).isFalse();

        verify(mPreference).setChecked(false);

        verify(mPreference).setEnabled(false);

    }



    @Test

    public void onDeveloperOptionsSwitchEnabled_shouldTurnOnPreference() {

        mController.onDeveloperOptionsSwitchEnabled();



        verify(mPreference).setEnabled(true);

    }

}