PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use InputSettings in Settings app

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/PointerSpeedPreference.java
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 {

10
src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java
View File

@@ -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;
}

13
src/com/android/settings/inputmethod/TrackpadPointerSpeedPreferenceController.java
View File

@@ -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;
}
}

10
src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java
View File

@@ -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;
}

10
src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java
View File

@@ -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;
}

12
tests/robotests/src/com/android/settings/inputmethod/TrackpadPointerSpeedPreferenceControllerTest.java
View File

@@ -19,7 +19,7 @@ package com.android.settings.inputmethod;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.hardware.input.InputManager;
import android.hardware.input.InputSettings;
import android.os.UserHandle;
import android.provider.Settings;
@@ -50,7 +50,7 @@ public class TrackpadPointerSpeedPreferenceControllerTest {
mDefaultSpeed = Settings.System.getIntForUser(
mContext.getContentResolver(),
SETTING_KEY,
InputManager.DEFAULT_POINTER_SPEED,
InputSettings.DEFAULT_POINTER_SPEED,
UserHandle.USER_CURRENT);
}
@@ -62,12 +62,12 @@ public class TrackpadPointerSpeedPreferenceControllerTest {
@Test
public void getMin_expected() {
assertThat(mController.getMin()).isEqualTo(InputManager.MIN_POINTER_SPEED);
assertThat(mController.getMin()).isEqualTo(InputSettings.MIN_POINTER_SPEED);
}
@Test
public void getMax_expected() {
assertThat(mController.getMax()).isEqualTo(InputManager.MAX_POINTER_SPEED);
assertThat(mController.getMax()).isEqualTo(InputSettings.MAX_POINTER_SPEED);
}
@Test
@@ -89,7 +89,7 @@ public class TrackpadPointerSpeedPreferenceControllerTest {
@Test
public void setSliderPosition_speedValueOverMaxValue_shouldReturnFalse() {
int inputSpeed = InputManager.MAX_POINTER_SPEED + 1;
int inputSpeed = InputSettings.MAX_POINTER_SPEED + 1;
boolean result = mController.setSliderPosition(inputSpeed);
@@ -99,7 +99,7 @@ public class TrackpadPointerSpeedPreferenceControllerTest {
@Test
public void setSliderPosition_speedValueOverMinValue_shouldReturnFalse() {
int inputSpeed = InputManager.MIN_POINTER_SPEED - 1;
int inputSpeed = InputSettings.MIN_POINTER_SPEED - 1;
boolean result = mController.setSliderPosition(inputSpeed);