Merge "Find the double twist sensor using the type instead of the name" into sc-dev am: 6e972e81ef

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270335

Change-Id: Ibbc0b965e9b0676cefc78570f5ec46c6bbc30330
This commit is contained in:
Edgar Wang
2021-07-19 13:12:40 +00:00
committed by Automerger Merge Worker
3 changed files with 9 additions and 9 deletions

View File

@@ -53,13 +53,13 @@ public class DoubleTwistPreferenceController extends GesturePreferenceController
public static boolean isGestureAvailable(Context context) {
final Resources resources = context.getResources();
final String name = resources.getString(R.string.gesture_double_twist_sensor_name);
final String type = resources.getString(R.string.gesture_double_twist_sensor_type);
final String vendor = resources.getString(R.string.gesture_double_twist_sensor_vendor);
if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(vendor)) {
if (!TextUtils.isEmpty(type) && !TextUtils.isEmpty(vendor)) {
final SensorManager sensorManager =
(SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
for (Sensor s : sensorManager.getSensorList(Sensor.TYPE_ALL)) {
if (name.equals(s.getName()) && vendor.equals(s.getVendor())) {
if (type.equals(s.getStringType()) && vendor.equals(s.getVendor())) {
return true;
}
}