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

Commit f2d6fe9e authored by Abdelrahman Awadalla's avatar Abdelrahman Awadalla
Browse files

Add "Touchpad visualizer" to input developer options 

Bug: 286551975
Bug: 350039816
Test: atest TouchpadVisualizerPreferenceControllerTest
Test: Manual testing using
      $ adb shell settings get system touchpad_visualizer
Flag: com.android.hardware.input.touchpad_visualizer

Change-Id: Ic5de704c49aabf1a80d202aa890055f7337d45d4
parent 09fb13fd

res/xml/development_settings.xml

+5 −0
Original line number Diff line number Diff line
@@ -507,6 +507,11 @@ 
            android:title="@string/show_key_presses"

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



        <SwitchPreference

            android:key="touchpad_visualizer"

            android:title="@string/touchpad_visualizer"

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



    </PreferenceCategory>



    <PreferenceCategory

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

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

        controllers.add(new PointerLocationPreferenceController(context));

        controllers.add(new ShowKeyPressesPreferenceController(context));

        controllers.add(new TouchpadVisualizerPreferenceController(context));

        controllers.add(new ShowSurfaceUpdatesPreferenceController(context));

        controllers.add(new ShowLayoutBoundsPreferenceController(context));

        controllers.add(new ShowHdrSdrRatioPreferenceController(context));

src/com/android/settings/development/OWNERS

+3 −0
Original line number Diff line number Diff line
@@ -16,3 +16,6 @@ per-file DesktopModePreferenceController.java=file:platform/frameworks/base:/lib 
# ADB

per-file Adb*=set noparent

per-file Adb*=file:platform/packages/modules/adb:/OWNERS



#TouchpadVisualizerPreferenceController

per-file TouchpadVisualizerPreferenceController.java=file:platform/frameworks/base:/INPUT_OWNERS

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

0 → 100644
+83 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2024 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 androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.SwitchPreference;



import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import android.hardware.input.InputSettings;



/** PreferenceController that controls the "Touchpad visualizer" developer option. */

public class TouchpadVisualizerPreferenceController extends

        DeveloperOptionsPreferenceController implements

        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {



    private static final String TOUCHPAD_VISUALIZER_KEY = "touchpad_visualizer";



    @VisibleForTesting

    static final int SETTING_VALUE_ON = 1;

    @VisibleForTesting

    static final int SETTING_VALUE_OFF = 0;



    public TouchpadVisualizerPreferenceController(@NonNull Context context) {

        super(context);

    }



    @Override

    public @NonNull String getPreferenceKey() {

        return TOUCHPAD_VISUALIZER_KEY;

    }



    @Override

    public boolean isAvailable(){

        return InputSettings.isTouchpadVisualizerFeatureFlagEnabled();

    }



    @Override

    public boolean onPreferenceChange(@NonNull Preference preference, @Nullable Object newValue) {

        final boolean isEnabled = newValue != null ? (Boolean) newValue : false;

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

                Settings.System.TOUCHPAD_VISUALIZER,

                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);

        return true;

    }



    @Override

    public void updateState(@NonNull Preference preference) {

        int touchpadVisualizer = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.TOUCHPAD_VISUALIZER, SETTING_VALUE_OFF);

        ((SwitchPreference) mPreference).setChecked(touchpadVisualizer != SETTING_VALUE_OFF);

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        super.onDeveloperOptionsSwitchDisabled();

        Settings.System.putInt(mContext.getContentResolver(), Settings.System.TOUCHPAD_VISUALIZER,

                SETTING_VALUE_OFF);

        ((SwitchPreference) mPreference).setChecked(false);

    }

}
 
 No newline at end of file

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

0 → 100644
+111 −0
Original line number Diff line number Diff line 
/*

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



import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreference;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



@RunWith(RobolectricTestRunner.class)

public class TouchpadVisualizerPreferenceControllerTest {



    @Mock

    private PreferenceScreen mScreen;

    @Mock

    private SwitchPreference mPreference;



    private Context mContext;



    private TouchpadVisualizerPreferenceController mController;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mController = new TouchpadVisualizerPreferenceController(mContext);

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

        mController.displayPreference(mScreen);

    }



    @Test

    public void updateState_touchpadVisualizerEnabled_shouldCheckedPreference() {

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

                Settings.System.TOUCHPAD_VISUALIZER, ShowTapsPreferenceController.SETTING_VALUE_ON);



        mController.updateState(mPreference);



        verify(mPreference).setChecked(true);

    }



    @Test

    public void updateState_touchpadVisualizerDisabled_shouldUncheckedPreference() {

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

                Settings.System.TOUCHPAD_VISUALIZER,

                ShowTapsPreferenceController.SETTING_VALUE_OFF);



        mController.updateState(mPreference);



        verify(mPreference).setChecked(false);

    }



    @Test

    public void onPreferenceChange_preferenceChecked_shouldEnableTouchpadVisualizer() {

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



        final int touchpadVisualizer = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.TOUCHPAD_VISUALIZER, -1 /* default */);



        assertThat(touchpadVisualizer).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_ON);

    }



    @Test

    public void onPreferenceChange_preferenceUnchecked_shouldDisableTouchpadVisualizer() {

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



        final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.TOUCHPAD_VISUALIZER, -1 /* default */);



        assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF);

    }



    @Test

    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {

        mController.onDeveloperOptionsSwitchDisabled();



        final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.TOUCHPAD_VISUALIZER, -1 /* default */);



        assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF);

        verify(mPreference).setEnabled(false);

        verify(mPreference).setChecked(false);

    }

}
 
 No newline at end of file