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

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

Merge "Introduce HardwareLayersUpdatesPreferenceCtrl"

parents 76a2128f a9f7c95f

res/xml/development_prefs.xml

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ 
                android:summary="@string/show_hw_screen_updates_summary"/>



        <SwitchPreference

                android:key="show_hw_layers_udpates"

                android:key="show_hw_layers_updates"

                android:title="@string/show_hw_layers_updates"

                android:summary="@string/show_hw_layers_updates_summary"/>

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

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
    private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";

    private static final String SHOW_NON_RECTANGULAR_CLIP_KEY = "show_non_rect_clip";

    private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_udpates";

    private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_udpates";

    private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_updates";

    private static final String DEBUG_HW_OVERDRAW_KEY = "debug_hw_overdraw";

    private static final String DEBUG_HW_RENDERER_KEY = "debug_hw_renderer";

    private static final String DEBUG_LAYOUT_KEY = "debug_layout";

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

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        // smallest width

        controllers.add(new ForceGpuRenderingPreferenceController(context));

        // show gpu view updates

        // show hardware layers updates

        controllers.add(new HardwareLayersUpdatesPreferenceController(context));

        // debug gpu overdraw

        // debug non-rectangular clip operations

        // force 4x msaa

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

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

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.view.ThreadedRenderer;



import com.android.settingslib.development.SystemPropPoker;



public class HardwareLayersUpdatesPreferenceController extends

        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {



    private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_updates";



    private SwitchPreference mPreference;



    public HardwareLayersUpdatesPreferenceController(Context context) {

        super(context);

    }



    @Override

    public String getPreferenceKey() {

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

        SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,

                isEnabled ? "true" : null);

        SystemPropPoker.getInstance().poke();

        return true;

    }



    @Override

    public void updateState(Preference preference) {

        final boolean isEnabled = SystemProperties.getBoolean(

                ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);

        mPreference.setChecked(isEnabled);

    }



    @Override

    protected void onDeveloperOptionsSwitchEnabled() {

        mPreference.setEnabled(true);

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, null);

        mPreference.setEnabled(false);

        mPreference.setChecked(false);

    }

}

tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.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.support.v14.preference.SwitchPreference;

import android.support.v7.preference.PreferenceScreen;

import android.view.ThreadedRenderer;



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;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION,

        shadows = {SettingsShadowSystemProperties.class})

public class HardwareLayersUpdatesPreferenceControllerTest {



    @Mock

    private SwitchPreference mPreference;

    @Mock

    private PreferenceScreen mPreferenceScreen;



    private Context mContext;

    private HardwareLayersUpdatesPreferenceController mController;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mController = new HardwareLayersUpdatesPreferenceController(mContext);

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

                mPreference);

        mController.displayPreference(mPreferenceScreen);

    }



    @After

    public void tearDown() {

        SettingsShadowSystemProperties.clear();

    }



    @Test

    public void onPreferenceChanged_settingEnabled_turnOnHardwareLayersUpdates() {

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



        final boolean mode = SettingsShadowSystemProperties.getBoolean(

                ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);



        assertThat(mode).isTrue();

    }



    @Test

    public void onPreferenceChanged_settingDisabled_turnOffHardwareLayersUpdates() {

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



        final boolean mode = SettingsShadowSystemProperties.getBoolean(

                ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);



        assertThat(mode).isFalse();

    }



    @Test

    public void updateState_settingEnabled_preferenceShouldBeChecked() {

        SettingsShadowSystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,

                Boolean.toString(true));

        mController.updateState(mPreference);



        verify(mPreference).setChecked(true);

    }



    @Test

    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {

        SettingsShadowSystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_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();



        final boolean mode = SettingsShadowSystemProperties.getBoolean(

                ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);



        assertThat(mode).isFalse();

        verify(mPreference).setEnabled(true);

    }

}