diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-10 16:27:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 16:27:27 -0700 |
| commit | 2264a64331b39b0770b72a71a453601cc1b9b9ac (patch) | |
| tree | fb8e14f14dbf1049a91ec9e1f6cf29bc0c93b94d /src | |
| parent | af0cea0a2148f8915a57c50a571636911feed9d3 (diff) | |
| parent | e656031ff8c48dffafe965b5859c5c82a5f23fe7 (diff) | |
| download | packages_apps_settings-2264a64331b39b0770b72a71a453601cc1b9b9ac.zip packages_apps_settings-2264a64331b39b0770b72a71a453601cc1b9b9ac.tar.gz packages_apps_settings-2264a64331b39b0770b72a71a453601cc1b9b9ac.tar.bz2 | |
Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/ChooseLockPattern.java | 1 | ||||
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 17 |
2 files changed, 0 insertions, 18 deletions
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 @@ public class ChooseLockPattern extends PreferenceActivity { 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 @@ public class SecuritySettings extends SettingsPreferenceFragment 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 @@ public class SecuritySettings extends SettingsPreferenceFragment private CheckBoxPreference mBiometricWeakLiveliness; private CheckBoxPreference mVisiblePattern; - private CheckBoxPreference mTactileFeedback; private CheckBoxPreference mShowPassword; @@ -222,16 +220,6 @@ public class SecuritySettings extends SettingsPreferenceFragment } } - // 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 @@ public class SecuritySettings extends SettingsPreferenceFragment 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 @@ public class SecuritySettings extends SettingsPreferenceFragment 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) { |