Move lockscreen to using haptic feedback setting.
This removes lockscreen-specific "Vibrate on touch" setting, and
changes it to use the haptic feedback setting instead.
Bug: 7318772
Change-Id: Id6931903b3ebeca6aeacef9b127490a381cd40b4
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index c95596b..566f8c2 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -51,10 +51,6 @@
android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
- <CheckBoxPreference
- android:key="unlock_tactile_feedback"
- android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
-
<PreferenceScreen
android:key="choose_lockscreen_status_widget"
android:title="@string/choose_lockscreen_status_widget_picker_title"
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 47fa1cc..b764c13 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -42,10 +42,6 @@
android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
- <CheckBoxPreference
- android:key="unlock_tactile_feedback"
- android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
-
<PreferenceScreen
android:key="choose_lockscreen_status_widget"
android:title="@string/choose_lockscreen_status_widget_picker_title"
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index a019125..f0aacaa 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -38,10 +38,6 @@
android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
- <CheckBoxPreference
- android:key="unlock_tactile_feedback"
- android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
-
<PreferenceScreen
android:key="choose_lockscreen_status_widget"
android:title="@string/choose_lockscreen_status_widget_picker_title"
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 295e8ea..f9c01b6 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -521,7 +521,6 @@
if (lockVirgin) {
utils.setVisiblePatternEnabled(true);
- utils.setTactileFeedbackEnabled(false);
}
getActivity().setResult(RESULT_FINISHED);
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index f56fc25..aed6cf3 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -71,7 +71,6 @@
private static final String KEY_BIOMETRIC_WEAK_LIVELINESS = "biometric_weak_liveliness";
private static final String KEY_LOCK_ENABLED = "lockenabled";
private static final String KEY_VISIBLE_PATTERN = "visiblepattern";
- private static final String KEY_TACTILE_FEEDBACK_ENABLED = "unlock_tactile_feedback";
private static final String KEY_SECURITY_CATEGORY = "security_category";
private static final String KEY_DEVICE_ADMIN_CATEGORY = "device_admin_category";
private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout";
@@ -105,7 +104,6 @@
private CheckBoxPreference mBiometricWeakLiveliness;
private CheckBoxPreference mVisiblePattern;
- private CheckBoxPreference mTactileFeedback;
private CheckBoxPreference mShowPassword;
@@ -222,16 +220,6 @@
}
}
- // tactile feedback. Should be common to all unlock preference screens.
- mTactileFeedback = (CheckBoxPreference) root.findPreference(KEY_TACTILE_FEEDBACK_ENABLED);
- if (!((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) {
- PreferenceGroup securityCategory = (PreferenceGroup)
- root.findPreference(KEY_SECURITY_CATEGORY);
- if (securityCategory != null && mTactileFeedback != null) {
- securityCategory.removePreference(mTactileFeedback);
- }
- }
-
mUserSelectedWidget = root.findPreference(KEY_CHOOSE_LOCKSCREEN_STATUS_WIDGET);
if (mUserSelectedWidget != null) {
AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity());
@@ -469,9 +457,6 @@
if (mVisiblePattern != null) {
mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled());
}
- if (mTactileFeedback != null) {
- mTactileFeedback.setChecked(lockPatternUtils.isTactileFeedbackEnabled());
- }
if (mPowerButtonInstantlyLocks != null) {
mPowerButtonInstantlyLocks.setChecked(lockPatternUtils.getPowerButtonInstantlyLocks());
}
@@ -608,8 +593,6 @@
lockPatternUtils.setLockPatternEnabled(isToggled(preference));
} else if (KEY_VISIBLE_PATTERN.equals(key)) {
lockPatternUtils.setVisiblePatternEnabled(isToggled(preference));
- } else if (KEY_TACTILE_FEEDBACK_ENABLED.equals(key)) {
- lockPatternUtils.setTactileFeedbackEnabled(isToggled(preference));
} else if (KEY_POWER_INSTANTLY_LOCKS.equals(key)) {
lockPatternUtils.setPowerButtonInstantlyLocks(isToggled(preference));
} else if (preference == mShowPassword) {