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

Commit 282b5201 authored by Josep del Río's avatar Josep del Río Committed by Android (Google) Code Review
Browse files

Merge "Use InputSettings in Settings app"

parents 8fe24062 8411d1c6

src/com/android/settings/PointerSpeedPreference.java

+11 −10
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.database.ContentObserver;

import android.hardware.input.InputManager;

import android.hardware.input.InputSettings;

import android.os.Handler;

import android.os.Parcel;

import android.os.Parcelable;
@@ -74,16 +75,16 @@ public class PointerSpeedPreference extends SeekBarDialogPreference implements 
        super.onBindDialogView(view);



        mSeekBar = getSeekBar(view);

        mSeekBar.setMax(InputManager.MAX_POINTER_SPEED - InputManager.MIN_POINTER_SPEED);

        mOldSpeed = mIm.getPointerSpeed(getContext());

        mSeekBar.setProgress(mOldSpeed - InputManager.MIN_POINTER_SPEED);

        mSeekBar.setMax(InputSettings.MAX_POINTER_SPEED - InputSettings.MIN_POINTER_SPEED);

        mOldSpeed = InputSettings.getPointerSpeed(getContext());

        mSeekBar.setProgress(mOldSpeed - InputSettings.MIN_POINTER_SPEED);

        mSeekBar.setOnSeekBarChangeListener(this);

        mSeekBar.setContentDescription(getTitle());

    }



    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {

        if (!mTouchInProgress) {

            mIm.tryPointerSpeed(progress + InputManager.MIN_POINTER_SPEED);

            mIm.tryPointerSpeed(progress + InputSettings.MIN_POINTER_SPEED);

        }

        if (progress != mLastProgress) {

            seekBar.performHapticFeedback(CLOCK_TICK);
@@ -100,13 +101,13 @@ public class PointerSpeedPreference extends SeekBarDialogPreference implements 


    public void onStopTrackingTouch(SeekBar seekBar) {

        mTouchInProgress = false;

        mIm.tryPointerSpeed(seekBar.getProgress() + InputManager.MIN_POINTER_SPEED);

        mIm.tryPointerSpeed(seekBar.getProgress() + InputSettings.MIN_POINTER_SPEED);

        mJankMonitor.end(CUJ_SETTINGS_SLIDER);

    }



    private void onSpeedChanged() {

        int speed = mIm.getPointerSpeed(getContext());

        mSeekBar.setProgress(speed - InputManager.MIN_POINTER_SPEED);

        int speed = InputSettings.getPointerSpeed(getContext());

        mSeekBar.setProgress(speed - InputSettings.MIN_POINTER_SPEED);

    }



    @Override
@@ -116,8 +117,8 @@ public class PointerSpeedPreference extends SeekBarDialogPreference implements 
        final ContentResolver resolver = getContext().getContentResolver();



        if (positiveResult) {

            mIm.setPointerSpeed(getContext(),

                    mSeekBar.getProgress() + InputManager.MIN_POINTER_SPEED);

            InputSettings.setPointerSpeed(getContext(),

                    mSeekBar.getProgress() + InputSettings.MIN_POINTER_SPEED);

        } else {

            restoreOldState();

        }
@@ -158,7 +159,7 @@ public class PointerSpeedPreference extends SeekBarDialogPreference implements 
        SavedState myState = (SavedState) state;

        super.onRestoreInstanceState(myState.getSuperState());

        mOldSpeed = myState.oldSpeed;

        mIm.tryPointerSpeed(myState.progress + InputManager.MIN_POINTER_SPEED);

        mIm.tryPointerSpeed(myState.progress + InputSettings.MIN_POINTER_SPEED);

    }



    private static class SavedState extends BaseSavedState {

src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java

+3 −7
Original line number Diff line number Diff line
@@ -17,29 +17,25 @@ 
package com.android.settings.inputmethod;



import android.content.Context;

import android.hardware.input.InputManager;

import android.hardware.input.InputSettings;



import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;



public class TrackpadBottomPreferenceController extends TogglePreferenceController {



    private InputManager mIm;



    public TrackpadBottomPreferenceController(Context context, String key) {

        super(context, key);



        mIm =  context.getSystemService(InputManager.class);

    }



    @Override

    public boolean isChecked() {

        return mIm.useTouchpadRightClickZone(mContext);

        return InputSettings.useTouchpadRightClickZone(mContext);

    }



    @Override

    public boolean setChecked(boolean isChecked) {

        mIm.setTouchpadRightClickZone(mContext, isChecked);

        InputSettings.setTouchpadRightClickZone(mContext, isChecked);

        return true;

    }

src/com/android/settings/inputmethod/TrackpadPointerSpeedPreferenceController.java

+5 −8
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.settings.inputmethod;



import android.content.Context;

import android.hardware.input.InputManager;

import android.hardware.input.InputSettings;



import androidx.preference.PreferenceScreen;
@@ -26,13 +26,10 @@ import com.android.settings.widget.SeekBarPreference; 


public class TrackpadPointerSpeedPreferenceController extends SliderPreferenceController {



    private InputManager mIm;

    private SeekBarPreference mPreference;



    public TrackpadPointerSpeedPreferenceController(Context context, String key) {

        super(context, key);



        mIm = context.getSystemService(InputManager.class);

    }



    @Override
@@ -55,22 +52,22 @@ public class TrackpadPointerSpeedPreferenceController extends SliderPreferenceCo 
        if (position < getMin() || position > getMax()) {

            return false;

        }

        mIm.setTouchpadPointerSpeed(mContext, position);

        InputSettings.setTouchpadPointerSpeed(mContext, position);

        return true;

    }



    @Override

    public int getSliderPosition() {

        return mIm.getTouchpadPointerSpeed(mContext);

        return InputSettings.getTouchpadPointerSpeed(mContext);

    }



    @Override

    public int getMin() {

        return InputManager.MIN_POINTER_SPEED;

        return InputSettings.MIN_POINTER_SPEED;

    }



    @Override

    public int getMax() {

        return InputManager.MAX_POINTER_SPEED;

        return InputSettings.MAX_POINTER_SPEED;

    }

}

src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java

+3 −7
Original line number Diff line number Diff line
@@ -17,29 +17,25 @@ 
package com.android.settings.inputmethod;



import android.content.Context;

import android.hardware.input.InputManager;

import android.hardware.input.InputSettings;



import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;



public class TrackpadReverseScrollingPreferenceController extends TogglePreferenceController {



    private InputManager mIm;



    public TrackpadReverseScrollingPreferenceController(Context context, String key) {

        super(context, key);



        mIm =  context.getSystemService(InputManager.class);

    }



    @Override

    public boolean isChecked() {

        return mIm.useTouchpadNaturalScrolling(mContext);

        return InputSettings.useTouchpadNaturalScrolling(mContext);

    }



    @Override

    public boolean setChecked(boolean isChecked) {

        mIm.setTouchpadNaturalScrolling(mContext, isChecked);

        InputSettings.setTouchpadNaturalScrolling(mContext, isChecked);

        return true;

    }

src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java

+3 −7
Original line number Diff line number Diff line
@@ -17,29 +17,25 @@ 
package com.android.settings.inputmethod;



import android.content.Context;

import android.hardware.input.InputManager;

import android.hardware.input.InputSettings;



import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;



public class TrackpadTapToClickPreferenceController extends TogglePreferenceController {



    private InputManager mIm;



    public TrackpadTapToClickPreferenceController(Context context, String key) {

        super(context, key);



        mIm = context.getSystemService(InputManager.class);

    }



    @Override

    public boolean isChecked() {

        return mIm.useTouchpadTapToClick(mContext);

        return InputSettings.useTouchpadTapToClick(mContext);

    }



    @Override

    public boolean setChecked(boolean isChecked) {

        mIm.setTouchpadTapToClick(mContext, isChecked);

        InputSettings.setTouchpadTapToClick(mContext, isChecked);

        return true;

    }