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

Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2016-04-20 17:50:32 +00:00
committed by Android (Google) Code Review
parent ea80ebcd92 c779bece31
commit b2f161ab38
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/development_prefs.xml
View File

@@ -15,6 +15,7 @@
--> -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/development_settings_title"> android:title="@string/development_settings_title">
<com.android.settings.BugreportPreference <com.android.settings.BugreportPreference
android:key="bugreport" android:key="bugreport"
@@ -32,10 +33,11 @@
android:targetClass="com.android.settings.SetFullBackupPassword" /> android:targetClass="com.android.settings.SetFullBackupPassword" />
</PreferenceScreen> </PreferenceScreen>
<SwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="keep_screen_on" android:key="keep_screen_on"
android:title="@string/keep_screen_on" android:title="@string/keep_screen_on"
android:summary="@string/keep_screen_on_summary"/> android:summary="@string/keep_screen_on_summary"
settings:useAdditionalSummary="true" />
<ListPreference <ListPreference
android:key="hdcp_checking" android:key="hdcp_checking"

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

@@ -84,6 +84,9 @@ import com.android.settings.fuelgauge.InactiveApps;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable; import com.android.settings.search.Indexable;
import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBar;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedSwitchPreference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -232,7 +235,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private SwitchPreference mEnableTerminal; private SwitchPreference mEnableTerminal;
private Preference mBugreport; private Preference mBugreport;
private SwitchPreference mBugreportInPower; private SwitchPreference mBugreportInPower;
private SwitchPreference mKeepScreenOn; private RestrictedSwitchPreference mKeepScreenOn;
private SwitchPreference mBtHciSnoopLog; private SwitchPreference mBtHciSnoopLog;
private SwitchPreference mEnableOemUnlock; private SwitchPreference mEnableOemUnlock;
private SwitchPreference mDebugViewAttributes; private SwitchPreference mDebugViewAttributes;
@@ -364,7 +367,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mBugreport = findPreference(BUGREPORT); mBugreport = findPreference(BUGREPORT);
mBugreportInPower = findAndInitSwitchPref(BUGREPORT_IN_POWER_KEY); mBugreportInPower = findAndInitSwitchPref(BUGREPORT_IN_POWER_KEY);
mKeepScreenOn = findAndInitSwitchPref(KEEP_SCREEN_ON); mKeepScreenOn = (RestrictedSwitchPreference) findAndInitSwitchPref(KEEP_SCREEN_ON);
mBtHciSnoopLog = findAndInitSwitchPref(BT_HCI_SNOOP_LOG); mBtHciSnoopLog = findAndInitSwitchPref(BT_HCI_SNOOP_LOG);
mEnableOemUnlock = findAndInitSwitchPref(ENABLE_OEM_UNLOCK); mEnableOemUnlock = findAndInitSwitchPref(ENABLE_OEM_UNLOCK);
if (!showEnableOemUnlockPreference()) { if (!showEnableOemUnlockPreference()) {
@@ -562,14 +565,17 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
return; return;
} }
if (mDpm.getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId()) > 0) {
// A DeviceAdmin has specified a maximum time until the device // A DeviceAdmin has specified a maximum time until the device
// will lock... in this case we can't allow the user to turn // will lock... in this case we can't allow the user to turn
// on "stay awake when plugged in" because that would defeat the // on "stay awake when plugged in" because that would defeat the
// restriction. // restriction.
mDisabledPrefs.add(mKeepScreenOn); final EnforcedAdmin admin = RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(
} else { getActivity());
mKeepScreenOn.setDisabledByAdmin(admin);
if (admin == null) {
mDisabledPrefs.remove(mKeepScreenOn); mDisabledPrefs.remove(mKeepScreenOn);
} else {
mDisabledPrefs.add(mKeepScreenOn);
} }
final ContentResolver cr = getActivity().getContentResolver(); final ContentResolver cr = getActivity().getContentResolver();