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

Commit 4999427c authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

Replace slider UI 

Test: manual
Test: atest LongPressPowerSensitivityPreferenceControllerTest
Flag: EXEMPT bugfix
Fixes: 405888738

Change-Id: I0de242996d81c76bfe467a08e7ee4b9577efbb8a
parent 44215796

res/xml/power_menu_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
            settings:controller="com.android.settings.gestures.LongPressPowerForAssistantPreferenceController"/>

    </PreferenceCategory>



    <com.android.settings.widget.LabeledSeekBarPreference

    <com.android.settingslib.widget.SliderPreference

        android:key="gesture_power_menu_long_press_for_assist_sensitivity"

        android:title="@string/power_menu_long_press_for_assist_sensitivity_title"

        android:summary="@string/power_menu_long_press_for_assist_sensitivity_summary"

src/com/android/settings/gestures/LongPressPowerSensitivityPreferenceController.java

+8 −6
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceScreen;



import com.android.settings.core.SliderPreferenceController;

import com.android.settings.widget.LabeledSeekBarPreference;

import com.android.settingslib.widget.SliderPreference;



/** Handles changes to the long press power button sensitivity slider. */

public class LongPressPowerSensitivityPreferenceController extends SliderPreferenceController
@@ -40,7 +40,7 @@ public class LongPressPowerSensitivityPreferenceController extends SliderPrefere 
    private final PowerMenuSettingsUtils mUtils;



    @Nullable

    private LabeledSeekBarPreference mPreference;

    private SliderPreference mPreference;



    public LongPressPowerSensitivityPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);
@@ -66,22 +66,24 @@ public class LongPressPowerSensitivityPreferenceController extends SliderPrefere 
        super.displayPreference(screen);

        mPreference = screen.findPreference(getPreferenceKey());

        if (mPreference != null) {

            mPreference.setContinuousUpdates(false);

            mPreference.setUpdatesContinuously(false);

            mPreference.setHapticFeedbackMode(

                    LabeledSeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_TICKS);

                    SliderPreference.HAPTIC_FEEDBACK_MODE_ON_TICKS);

            mPreference.setMin(getMin());

            mPreference.setMax(getMax());

            mPreference.setTickVisible(true);

            mPreference.setSliderIncrement(1);

        }

    }



    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        final LabeledSeekBarPreference pref = (LabeledSeekBarPreference) preference;

        final SliderPreference pref = (SliderPreference) preference;

        pref.setVisible(

                PowerMenuSettingsUtils.isLongPressPowerForAssistantEnabled(mContext)

                        && getAvailabilityStatus() == AVAILABLE);

        pref.setProgress(getSliderPosition());

        pref.setValue(getSliderPosition());

    }



    @Override

tests/robotests/src/com/android/settings/gestures/LongPressPowerSensitivityPreferenceControllerTest.java

+8 −3
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import android.provider.Settings; 
import androidx.preference.PreferenceScreen;

import androidx.test.core.app.ApplicationProvider;



import com.android.settings.widget.LabeledSeekBarPreference;

import com.android.settingslib.testutils.shadow.ShadowInteractionJankMonitor;

import com.android.settingslib.widget.SliderPreference;



import org.junit.Before;

import org.junit.Test;
@@ -49,7 +49,7 @@ public class LongPressPowerSensitivityPreferenceControllerTest { 


    private Application mContext;

    private Resources mResources;

    private LabeledSeekBarPreference mPreference;

    private SliderPreference mPreference;

    private LongPressPowerSensitivityPreferenceController mController;

    private PreferenceScreen mScreen;
@@ -69,7 +69,7 @@ public class LongPressPowerSensitivityPreferenceControllerTest { 
        when(mResources.getInteger(com.android.internal.R.integer.config_longPressOnPowerBehavior))

                .thenReturn(5); // Default to Assistant



        mPreference = new LabeledSeekBarPreference(mContext, null);

        mPreference = new SliderPreference(mContext, null);

        mController = new LongPressPowerSensitivityPreferenceController(mContext,

                KEY_LONG_PRESS_SENSITIVITY);
@@ -106,6 +106,11 @@ public class LongPressPowerSensitivityPreferenceControllerTest { 
        assertThat(mController.setSliderPosition(10)).isFalse();

    }



    @Test

    public void discreteSlider_hasIncrementOne() {

        assertThat(mPreference.getSliderIncrement()).isEqualTo(1);

    }



    @Test

    public void getMin_isZero() {

        assertThat(mController.getMin()).isEqualTo(0);