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

Merge "Developer setting to skip Package Verification" into jb-mr1-dev

Browse Source
This commit is contained in:
rich cannings
2012-09-27 23:11:50 -07:00
committed by Android (Google) Code Review
parent cc24aa2b1f f04211443e
commit 4f64951cb8
5 changed files with 81 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
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";
private static final String KEY_OWNER_INFO_SETTINGS = "owner_info_settings";
private static final String EXTRA_NO_WIDGET = "com.android.settings.NO_WIDGET";
@@ -299,8 +300,14 @@ public class SecuritySettings extends SettingsPreferenceFragment
mToggleVerifyApps.setChecked(false);
mToggleVerifyApps.setEnabled(false);
}
} else if (mToggleVerifyApps != null) {
mToggleVerifyApps.setEnabled(false);
} else {
PreferenceGroup deviceAdminCategory= (PreferenceGroup)
root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
if (deviceAdminCategory != null) {
deviceAdminCategory.removePreference(mToggleVerifyApps);
} else {
mToggleVerifyApps.setEnabled(false);
}
}
return root;