Use InputSettings in Settings app

At the moment the settings app will make use of certain exposed
functions in InputManager that are being moved to a separate
class. This CL migrates those usages to the new internal API.

Bug: 267758905
Test: compiles, and should pass presubmit
Change-Id: I30dcb83aa1cc8830650fe856775a462ed37c2dda
This commit is contained in:
Josep del Rio
2023-02-05 21:20:23 +00:00
committed by Josep del Río
parent eb8ec1b1e4
commit 8411d1c663
6 changed files with 31 additions and 45 deletions

View File

@@ -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 {