am 32c8b874: am df82f5bf: am 52e728ab: Merge "Screen pinning set default lock on exit value" into mnc-dev

* commit '32c8b8745a766a5de43e8e480c9ec1097f519fa0':
  Screen pinning set default lock on exit value
This commit is contained in:
Jason Monk
2015-06-23 20:55:24 +00:00
committed by Android Git Automerger

View File

@@ -93,6 +93,10 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
private void setLockToAppEnabled(boolean isEnabled) {
Settings.System.putInt(getContentResolver(), Settings.System.LOCK_TO_APP_ENABLED,
isEnabled ? 1 : 0);
if (isEnabled) {
// Set the value to match what we have defaulted to in the UI.
setScreenLockUsedSetting(isScreenLockUsed());
}
}
private boolean isScreenLockUsed() {
@@ -115,9 +119,13 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
return false;
}
}
setScreenLockUsedSetting(isEnabled);
return true;
}
private void setScreenLockUsedSetting(boolean isEnabled) {
Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,
isEnabled ? 1 : 0);
return true;
}
@Override