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

Commit a19a2493 authored by jeffreyhuang's avatar jeffreyhuang
Browse files

Introduce ResizableActivityPreferenceController 

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

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I401db1fe3a051ee70ab9afe2bf8c377b3b0b4e2f
parent 498e883d

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

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        // show notification channel warnings

        // inactive apps

        controllers.add(new AllowAppsOnExternalPreferenceController(context));

        // force activities to be resizable

        controllers.add(new ResizableActivityPreferenceController(context));

        // reset shortcutmanager rate-limiting

        return controllers;

    }

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

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



public class ResizableActivityPreferenceController extends

        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {



    private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";



    @VisibleForTesting

    final static int SETTING_VALUE_ON = 1;

    @VisibleForTesting

    final static int SETTING_VALUE_OFF = 0;



    private SwitchPreference mPreference;



    public ResizableActivityPreferenceController(Context context) {

        super(context);

    }



    @Override

    public String getPreferenceKey() {

        return FORCE_RESIZABLE_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_FORCE_RESIZABLE_ACTIVITIES,

                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_FORCE_RESIZABLE_ACTIVITIES, 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_FORCE_RESIZABLE_ACTIVITIES, SETTING_VALUE_OFF);

        mPreference.setChecked(false);

        mPreference.setEnabled(false);

    }

}

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

0 → 100644
+124 −0
Original line number Diff line number Diff line 
package com.android.settings.development;



/*

 * 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.

 */



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.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 ResizableActivityPreferenceControllerTest {



    @Mock

    private SwitchPreference mPreference;

    @Mock

    private PreferenceScreen mScreen;



    private Context mContext;

    private ResizableActivityPreferenceController mController;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mController = new ResizableActivityPreferenceController(mContext);

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

        mController.displayPreference(mScreen);

    }



    @Test

    public void onPreferenceChange_settingEnabled_shouldEnableResizableActivities() {

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



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

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



        assertThat(mode).isEqualTo(

                ResizableActivityPreferenceController.SETTING_VALUE_ON);

    }



    @Test

    public void onPreferenceChange_settingDisabled_shouldDisableResizableActivities() {

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



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

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



        assertThat(mode).isEqualTo(

                ResizableActivityPreferenceController.SETTING_VALUE_OFF);

    }



    @Test

    public void updateState_settingEnabled_preferenceShouldBeChecked() {

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

                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,

                ResizableActivityPreferenceController.SETTING_VALUE_ON);



        mController.updateState(mPreference);



        verify(mPreference).setChecked(true);

    }



    @Test

    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {

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

                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,

                ResizableActivityPreferenceController.SETTING_VALUE_OFF);



        mController.updateState(mPreference);



        verify(mPreference).setChecked(false);

    }



    @Test

    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() {

        mController.onDeveloperOptionsSwitchDisabled();

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

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



        assertThat(mode).isEqualTo(

                ResizableActivityPreferenceController.SETTING_VALUE_OFF);

        verify(mPreference).setChecked(false);

        verify(mPreference).setEnabled(false);

    }



    @Test

    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {

        mController.onDeveloperOptionsSwitchEnabled();



        verify(mPreference).setEnabled(true);

    }

}