PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jim Miller
2012-10-12 13:20:15 -07:00
committed by Android (Google) Code Review
parent acc0e56ea7 1a6e3e175d
commit afc0036e27
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/settings/SecuritySettings.java
View File

@@ -39,6 +39,7 @@ import android.preference.CheckBoxPreference;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.Preference.OnPreferenceChangeListener; import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.PreferenceCategory;
import android.preference.PreferenceGroup; import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.provider.Settings; import android.provider.Settings;
@@ -98,7 +99,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
DevicePolicyManager mDPM; DevicePolicyManager mDPM;
private ChooseLockSettingsHelper mChooseLockSettingsHelper; private ChooseLockSettingsHelper mChooseLockSettingsHelper;
private Preference mUserSelectedWidget;
private LockPatternUtils mLockPatternUtils; private LockPatternUtils mLockPatternUtils;
private ListPreference mLockAfter; private ListPreference mLockAfter;
@@ -220,32 +220,45 @@ public class SecuritySettings extends SettingsPreferenceFragment
} }
} }
mUserSelectedWidget = root.findPreference(KEY_CHOOSE_LOCKSCREEN_STATUS_WIDGET); Preference pickStatusWidget = root.findPreference(KEY_CHOOSE_LOCKSCREEN_STATUS_WIDGET);
if (mUserSelectedWidget != null) { if (pickStatusWidget != null) {
AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity()); AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity());
int appWidgetId = getStatusAppWidgetId(); int appWidgetId = getStatusAppWidgetId();
if (appWidgetId == -1) { if (appWidgetId == -1) {
mUserSelectedWidget.setSummary(getResources().getString(R.string.widget_default)); pickStatusWidget.setSummary(getResources().getString(R.string.widget_default));
} else { } else {
AppWidgetProviderInfo appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId); AppWidgetProviderInfo appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId);
if (appWidget != null) { if (appWidget != null) {
mUserSelectedWidget.setSummary(appWidget.label); pickStatusWidget.setSummary(appWidget.label);
} }
} }
// TEMP: disable this for now
PreferenceCategory security =
(PreferenceCategory) root.findPreference(KEY_SECURITY_CATEGORY);
if (security != null) {
security.removePreference(pickStatusWidget);
}
} }
mUserSelectedWidget = root.findPreference(KEY_CHOOSE_USER_SELECTED_LOCKSCREEN_WIDGET); Preference pickLockscreenWidget =
if (mUserSelectedWidget != null) { root.findPreference(KEY_CHOOSE_USER_SELECTED_LOCKSCREEN_WIDGET);
if (pickLockscreenWidget != null) {
AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity()); AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity());
int appWidgetId = getUserSelectedAppWidgetId(); int appWidgetId = getUserSelectedAppWidgetId();
if (appWidgetId == -1) { if (appWidgetId == -1) {
mUserSelectedWidget.setSummary(getResources().getString(R.string.widget_none)); pickLockscreenWidget.setSummary(getResources().getString(R.string.widget_none));
} else { } else {
AppWidgetProviderInfo appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId); AppWidgetProviderInfo appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId);
if (appWidget != null) { if (appWidget != null) {
mUserSelectedWidget.setSummary(appWidget.label); pickLockscreenWidget.setSummary(appWidget.label);
} }
} }
// TEMP: disable this for now
PreferenceCategory security =
(PreferenceCategory) root.findPreference(KEY_SECURITY_CATEGORY);
if (security != null) {
security.removePreference(pickLockscreenWidget);
}
} }
// Append the rest of the settings // Append the rest of the settings