Added suggestions for gestures.
Bug: 30986021 Test: manual + make RunSettingsRoboTests + adb shell am instrument -w com.android.settings.tests.unit /android.support.test.runner.AndroidJUnitRunner Change-Id: I7337a141cb21e5a1399aaca05ec1facd8629577b Merged-In: I7aed110c81ca2fb6b90e2f359b4bb941c02bc1c3
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
package com.android.settings.gestures;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.res.Resources;
|
||||
import android.hardware.Sensor;
|
||||
import android.hardware.SensorManager;
|
||||
@@ -29,6 +30,7 @@ import android.text.TextUtils;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
public class DoubleTwistPreferenceController extends GesturePreferenceController {
|
||||
@@ -43,10 +45,30 @@ public class DoubleTwistPreferenceController extends GesturePreferenceController
|
||||
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
|
||||
}
|
||||
|
||||
public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {
|
||||
return !isGestureAvailable(context)
|
||||
|| prefs.getBoolean(DoubleTwistGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, false);
|
||||
}
|
||||
|
||||
private static boolean isGestureAvailable(Context context) {
|
||||
final Resources resources = context.getResources();
|
||||
final String name = resources.getString(R.string.gesture_double_twist_sensor_name);
|
||||
final String vendor = resources.getString(R.string.gesture_double_twist_sensor_vendor);
|
||||
if (!TextUtils.isEmpty(name) && !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())) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return hasSensor(R.string.gesture_double_twist_sensor_name,
|
||||
R.string.gesture_double_twist_sensor_vendor);
|
||||
return isGestureAvailable(mContext);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -83,20 +105,4 @@ public class DoubleTwistPreferenceController extends GesturePreferenceController
|
||||
int getManagedProfileUserId() {
|
||||
return Utils.getManagedProfileId(mUserManager, UserHandle.myUserId());
|
||||
}
|
||||
|
||||
private boolean hasSensor(int nameResId, int vendorResId) {
|
||||
final Resources resources = mContext.getResources();
|
||||
final String name = resources.getString(nameResId);
|
||||
final String vendor = resources.getString(vendorResId);
|
||||
if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(vendor)) {
|
||||
final SensorManager sensorManager =
|
||||
(SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE);
|
||||
for (Sensor s : sensorManager.getSensorList(Sensor.TYPE_ALL)) {
|
||||
if (name.equals(s.getName()) && vendor.equals(s.getVendor())) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user