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

Commit 1e64ae8e authored by Harry Cutts's avatar Harry Cutts
Browse files

Update touchpad visualizer dev. option to new look 

Fixes: 407254781
Test: check the switch matches the look of others in Developer options
Test: with a touchpad connected, toggle the switch and check the
      visualizer appears and disappears
Test: $ atest TouchpadVisualizerPreferenceControllerTest
Flag: EXEMPT bug fix
Change-Id: I35cc8fd98e930f21c8a89346f760326a9b9abf55
parent e238e8d6

res/xml/development_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ 
            android:title="@string/show_key_presses"

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



        <SwitchPreference

        <SwitchPreferenceCompat

            android:key="touchpad_visualizer"

            android:title="@string/touchpad_visualizer"

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

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

+3 −4
Original line number Diff line number Diff line
@@ -21,9 +21,8 @@ import android.hardware.input.InputSettings; 


import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.SwitchPreference;

import androidx.preference.SwitchPreferenceCompat;



import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -60,7 +59,7 @@ public class TouchpadVisualizerPreferenceController extends 
    @Override

    public void updateState(@NonNull Preference preference) {

        boolean touchpadVisualizerEnabled = InputSettings.useTouchpadVisualizer(mContext);

        ((SwitchPreference) mPreference).setChecked(touchpadVisualizerEnabled);

        ((SwitchPreferenceCompat) mPreference).setChecked(touchpadVisualizerEnabled);

    }



    @Override
@@ -68,6 +67,6 @@ public class TouchpadVisualizerPreferenceController extends 
        super.onDeveloperOptionsSwitchDisabled();

        InputSettings.setTouchpadVisualizer(mContext, false);



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

        ((SwitchPreferenceCompat) mPreference).setChecked(false);

    }

}
 
 No newline at end of file

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

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.platform.test.annotations.EnableFlags; 
import android.platform.test.flag.junit.SetFlagsRule;



import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreference;

import androidx.preference.SwitchPreferenceCompat;



import com.android.hardware.input.Flags;

import com.android.settings.testutils.shadow.ShadowSystemSettings;
@@ -54,7 +54,7 @@ public class TouchpadVisualizerPreferenceControllerTest { 
    @Mock

    private PreferenceScreen mScreen;

    @Mock

    private SwitchPreference mPreference;

    private SwitchPreferenceCompat mPreference;



    private Context mContext;