Merge "Disable security widgets for now" into jb-mr1-dev

diff --cc src/com/android/settings/SecuritySettings.java
index aed6cf3,2ddd41f..13b1d0d
--- 1/src/com/android/settings/SecuritySettings.java
--- 2/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@@ -220,8 -222,18 +220,8 @@@ public class SecuritySettings extends S
              }
          }
  
-         mUserSelectedWidget = root.findPreference(KEY_CHOOSE_LOCKSCREEN_STATUS_WIDGET);
-         if (mUserSelectedWidget != null) {
 -        // 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);
 -            }
 -        }
 -
+         Preference pickStatusWidget = root.findPreference(KEY_CHOOSE_LOCKSCREEN_STATUS_WIDGET);
+         if (pickStatusWidget != null) {
              AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity());
              int appWidgetId = getStatusAppWidgetId();
              if (appWidgetId == -1) {