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

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

Browse Source 
* commit 'df82f5bf1b90bc458a22aa0baec3e4f18da4e95c':
  Screen pinning set default lock on exit value
This commit is contained in:
Jason Monk
2015-06-23 20:46:01 +00:00
committed by Android Git Automerger
parent 5cb9669141 df82f5bf1b
commit 32c8b8745a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/ScreenPinningSettings.java
View File

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