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

am 9217185d: am c39dcc1c: Don\'t show developer options to secondary users

Browse Source 
* commit '9217185d74dad396ea87e4b82597c0fe2d949efe':
  Don't show developer options to secondary users
This commit is contained in:
Amith Yamasani
2013-04-13 18:51:53 -07:00
committed by Android Git Automerger
parent c9e8ea7b22 9217185d74
commit 7f34b399fc
4 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/settings/DevelopmentSettings.java
View File

@@ -48,6 +48,7 @@ import android.os.ServiceManager;
import android.os.StrictMode;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
@@ -65,6 +66,7 @@ import android.view.IWindowManager;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.Switch;
import android.widget.TextView;
import java.util.ArrayList;
import java.util.HashSet;
@@ -207,6 +209,8 @@ public class DevelopmentSettings extends PreferenceFragment
private Dialog mAdbDialog;
private Dialog mAdbKeysDialog;
private boolean mUnavailable;
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -216,6 +220,12 @@ public class DevelopmentSettings extends PreferenceFragment
ServiceManager.getService(Context.BACKUP_SERVICE));
mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
if (android.os.Process.myUserHandle().getIdentifier() != UserHandle.USER_OWNER) {
mUnavailable = true;
setPreferenceScreen(new PreferenceScreen(getActivity(), null));
return;
}
addPreferencesFromResource(R.xml.development_prefs);
final PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
@@ -343,6 +353,10 @@ public class DevelopmentSettings extends PreferenceFragment
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
mEnabledSwitch.setPaddingRelative(0, 0, padding, 0);
if (mUnavailable) {
mEnabledSwitch.setEnabled(false);
return;
}
mEnabledSwitch.setOnCheckedChangeListener(this);
}
@@ -389,6 +403,16 @@ public class DevelopmentSettings extends PreferenceFragment
public void onResume() {
super.onResume();
if (mUnavailable) {
// Show error message
TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
getListView().setEmptyView(emptyView);
if (emptyView != null) {
emptyView.setText(R.string.development_settings_not_available);
}
return;
}
if (mDpm.getMaximumTimeToLock(null) > 0) {
// A DeviceAdmin has specified a maximum time until the device
// will lock... in this case we can't allow the user to turn