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

Commit 60023506 authored by jeffreyhuang's avatar jeffreyhuang
Browse files

Introduce AnimatorDurationScalePreferenceCtrl 

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

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I38820337184916f5d174814721ff61fd14ae9055
parent e2fc925b

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

0 → 100644
+120 −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.support.annotation.VisibleForTesting;

import android.support.v7.preference.ListPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.view.IWindowManager;



import com.android.settings.R;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;



public class AnimatorDurationScalePreferenceController extends

        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,

        PreferenceControllerMixin {



    private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";



    @VisibleForTesting

    static final int ANIMATOR_DURATION_SCALE_SELECTOR = 2;

    @VisibleForTesting

    static final float DEFAULT_VALUE = 1;



    private final IWindowManager mWindowManager;

    private final String[] mListValues;

    private final String[] mListSummaries;



    private ListPreference mPreference;



    public AnimatorDurationScalePreferenceController(Context context) {

        super(context);



        mWindowManager = IWindowManager.Stub.asInterface(

                ServiceManager.getService(Context.WINDOW_SERVICE));

        mListValues = context.getResources().getStringArray(R.array.animator_duration_scale_values);

        mListSummaries = context.getResources().getStringArray(

                R.array.animator_duration_scale_entries);

    }



    @Override

    public String getPreferenceKey() {

        return ANIMATOR_DURATION_SCALE_KEY;

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);



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

    }



    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        writeAnimationScaleOption(newValue);

        return true;

    }



    @Override

    public void updateState(Preference preference) {

        updateAnimationScaleValue();

    }



    @Override

    protected void onDeveloperOptionsSwitchEnabled() {

        mPreference.setEnabled(true);

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        writeAnimationScaleOption(null);

        mPreference.setEnabled(false);

    }



    private void writeAnimationScaleOption(Object newValue) {

        try {

            float scale = newValue != null ? Float.parseFloat(newValue.toString()) : DEFAULT_VALUE;

            mWindowManager.setAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR, scale);

            updateAnimationScaleValue();

        } catch (RemoteException e) {

            // intentional no-op

        }

    }



    private void updateAnimationScaleValue() {

        try {

            final float scale = mWindowManager.getAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR);

            int index = 0; // default

            for (int i = 0; i < mListValues.length; i++) {

                float val = Float.parseFloat(mListValues[i]);

                if (scale <= val) {

                    index = i;

                    break;

                }

            }

            mPreference.setValue(mListValues[index]);

            mPreference.setSummary(mListSummaries[index]);

        } catch (RemoteException e) {

            // intentional no-op

        }

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        controllers.add(new RtlLayoutPreferenceController(context));

        // window animation scale

        // transition animation scale

        // animator duration scale

        controllers.add(new AnimatorDurationScalePreferenceController(context));

        // simulate secondary displays

        // smallest width

        controllers.add(new ForceGpuRenderingPreferenceController(context));

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

0 → 100644
+136 −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.AnimatorDurationScalePreferenceController

        .ANIMATOR_DURATION_SCALE_SELECTOR;

import static com.android.settings.development.AnimatorDurationScalePreferenceController

        .DEFAULT_VALUE;



import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.os.RemoteException;

import android.support.v7.preference.ListPreference;

import android.support.v7.preference.PreferenceScreen;

import android.view.IWindowManager;



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;

import org.robolectric.util.ReflectionHelpers;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class AnimatorDurationScalePreferenceControllerTest {



    @Mock

    private ListPreference mPreference;

    @Mock

    private PreferenceScreen mScreen;

    @Mock

    private IWindowManager mWindowManager;



    /**

     * 0: Animation off

     * 1: Animation scale .5x

     * 2: Animation scale 1x

     * 3: Animation scale 1.5x

     * 4: Animation scale 2x

     * 5: Animation scale 5x

     * 6: Animation scale 10x

     */

    private String[] mListValues;

    private String[] mListSummaries;

    private Context mContext;

    private AnimatorDurationScalePreferenceController mController;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mListValues = mContext.getResources().getStringArray(

                R.array.animator_duration_scale_values);

        mListSummaries = mContext.getResources().getStringArray(

                R.array.animator_duration_scale_entries);

        mController = new AnimatorDurationScalePreferenceController(mContext);

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

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

        mController.displayPreference(mScreen);

    }



    @Test

    public void onPreferenceChange_noValueSet_shouldSetDefault() throws RemoteException {

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



        verify(mWindowManager).setAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR, DEFAULT_VALUE);

    }



    @Test

    public void onPreferenceChange_option5Selected_shouldSetOption5() throws RemoteException {

        mController.onPreferenceChange(mPreference, mListValues[5]);



        verify(mWindowManager).setAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR,

                Float.valueOf(mListValues[5]));

    }



    @Test

    public void updateState_option5Set_shouldUpdatePreferenceToOption5() throws RemoteException {

        when(mWindowManager.getAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR)).thenReturn(

                Float.valueOf(mListValues[5]));



        mController.updateState(mPreference);



        verify(mPreference).setValue(mListValues[5]);

        verify(mPreference).setSummary(mListSummaries[5]);

    }



    @Test

    public void updateState_option3Set_shouldUpdatePreferenceToOption3() throws RemoteException {

        when(mWindowManager.getAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR)).thenReturn(

                Float.valueOf(mListValues[3]));



        mController.updateState(mPreference);



        verify(mPreference).setValue(mListValues[3]);

        verify(mPreference).setSummary(mListSummaries[3]);

    }



    @Test

    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() throws RemoteException {

        mController.onDeveloperOptionsSwitchDisabled();



        verify(mWindowManager).setAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR, DEFAULT_VALUE);

        verify(mPreference).setEnabled(false);

    }



    @Test

    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() throws RemoteException {

        mController.onDeveloperOptionsSwitchEnabled();



        verify(mPreference).setEnabled(true);

    }

}