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

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

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

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

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