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

Commit fe537f1b authored by Harry Cutts's avatar Harry Cutts Committed by Android (Google) Code Review
Browse files

Merge "Update touchpad visualizer dev. option to new look" into main

parents 5e827ee8 1e64ae8e

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;