diff options
author | Jason Monk <jmonk@google.com> | 2014-08-04 16:08:51 -0400 |
---|---|---|
committer | Jason Monk <jmonk@google.com> | 2014-10-31 15:45:12 -0400 |
commit | 78121d9d106f12f2b2bae53d323e89667dbdfeee (patch) | |
tree | 6d7f74ecfb6c7bd0a4f2a024094a6a2041b907dc /src/com/android/settings/ScreenPinningSettings.java | |
parent | 6f5b23f3fc4855c1906fd64fd3bcb9d5f14a02a2 (diff) | |
download | packages_apps_Settings-78121d9d106f12f2b2bae53d323e89667dbdfeee.zip packages_apps_Settings-78121d9d106f12f2b2bae53d323e89667dbdfeee.tar.gz packages_apps_Settings-78121d9d106f12f2b2bae53d323e89667dbdfeee.tar.bz2 |
Bring screen lock setting back to screen pinning
The material design of the request has removed this option from
the dialog, and now needs to be in settings. When screen
pinning is off it shows a description of how to use the feature,
however when on it shows a switch to control whether it locks
the device on exit. This setting defaults to on if there is a
lock pin/pattern.
Bug: 16957435
Change-Id: I59e0d64964cee4302e6ecff59e622cfe11422807
Diffstat (limited to 'src/com/android/settings/ScreenPinningSettings.java')
-rw-r--r-- | src/com/android/settings/ScreenPinningSettings.java | 138 |
1 files changed, 115 insertions, 23 deletions
diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java index ada5b17..3f39088 100644 --- a/src/com/android/settings/ScreenPinningSettings.java +++ b/src/com/android/settings/ScreenPinningSettings.java @@ -15,42 +15,59 @@ */ package com.android.settings; -import java.util.ArrayList; -import java.util.List; - +import android.app.admin.DevicePolicyManager; import android.content.Context; +import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; +import android.preference.Preference; +import android.preference.Preference.OnPreferenceChangeListener; +import android.preference.PreferenceScreen; +import android.preference.SwitchPreference; import android.provider.Settings; -import android.provider.Settings.SettingNotFoundException; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Switch; +import com.android.internal.widget.LockPatternUtils; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; import com.android.settings.widget.SwitchBar; +import java.util.ArrayList; +import java.util.List; + /** * Screen pinning settings. */ public class ScreenPinningSettings extends SettingsPreferenceFragment implements SwitchBar.OnSwitchChangeListener, Indexable { + private static final CharSequence KEY_USE_SCREEN_LOCK = "use_screen_lock"; + private static final int CHANGE_LOCK_METHOD_REQUEST = 43; + private SwitchBar mSwitchBar; + private SwitchPreference mUseScreenLock; + private LockPatternUtils mLockPatternUtils; @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); final SettingsActivity activity = (SettingsActivity) getActivity(); + mLockPatternUtils = new LockPatternUtils(activity); + + View emptyView = LayoutInflater.from(activity) + .inflate(R.layout.screen_pinning_instructions, null); + ((ViewGroup) getListView().getParent()).addView(emptyView); + getListView().setEmptyView(emptyView); mSwitchBar = activity.getSwitchBar(); mSwitchBar.addOnSwitchChangeListener(this); mSwitchBar.show(); - mSwitchBar.setChecked(isLockToAppEnabled()); + mSwitchBar.setChecked(isLockToAppEnabled(getActivity())); } @Override @@ -61,19 +78,9 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment mSwitchBar.hide(); } - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - return inflater.inflate(R.layout.screen_pinning_instructions, null); - } - - private boolean isLockToAppEnabled() { - try { - return Settings.System.getInt(getContentResolver(), Settings.System.LOCK_TO_APP_ENABLED) - != 0; - } catch (SettingNotFoundException e) { - return false; - } + private static boolean isLockToAppEnabled(Context context) { + return Settings.System.getInt(context.getContentResolver(), + Settings.System.LOCK_TO_APP_ENABLED, 0) != 0; } private void setLockToAppEnabled(boolean isEnabled) { @@ -81,12 +88,89 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment isEnabled ? 1 : 0); } + private boolean isScreenLockUsed() { + int def = getCurrentSecurityTitle() != R.string.screen_pinning_unlock_none ? 1 : 0; + return Settings.Secure.getInt(getContentResolver(), + Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, def) != 0; + } + + private boolean setScreenLockUsed(boolean isEnabled) { + if (isEnabled) { + LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity()); + if (lockPatternUtils.getKeyguardStoredPasswordQuality() + == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) { + Intent chooseLockIntent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD); + chooseLockIntent.putExtra( + ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY, + DevicePolicyManager.PASSWORD_QUALITY_SOMETHING); + startActivityForResult(chooseLockIntent, CHANGE_LOCK_METHOD_REQUEST); + return false; + } + } + Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, + isEnabled ? 1 : 0); + return true; + } + + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == CHANGE_LOCK_METHOD_REQUEST) { + LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity()); + boolean validPassQuality = lockPatternUtils.getKeyguardStoredPasswordQuality() + != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; + setScreenLockUsed(validPassQuality); + // Make sure the screen updates. + mUseScreenLock.setChecked(validPassQuality); + } + } + + private int getCurrentSecurityTitle() { + int quality = mLockPatternUtils.getKeyguardStoredPasswordQuality(); + switch (quality) { + case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: + case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX: + return R.string.screen_pinning_unlock_pin; + case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC: + case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC: + case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX: + return R.string.screen_pinning_unlock_password; + case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: + if (mLockPatternUtils.isLockPatternEnabled()) { + return R.string.screen_pinning_unlock_pattern; + } + } + return R.string.screen_pinning_unlock_none; + } + /** * Listens to the state change of the lock-to-app master switch. */ @Override public void onSwitchChanged(Switch switchView, boolean isChecked) { setLockToAppEnabled(isChecked); + updateDisplay(); + } + + public void updateDisplay() { + PreferenceScreen root = getPreferenceScreen(); + if (root != null) { + root.removeAll(); + } + if (isLockToAppEnabled(getActivity())) { + addPreferencesFromResource(R.xml.screen_pinning_settings); + root = getPreferenceScreen(); + + mUseScreenLock = (SwitchPreference) root.findPreference(KEY_USE_SCREEN_LOCK); + mUseScreenLock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + return setScreenLockUsed((boolean) newValue); + } + }); + mUseScreenLock.setChecked(isScreenLockUsed()); + mUseScreenLock.setTitle(getCurrentSecurityTitle()); + } } /** @@ -106,11 +190,19 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment data.screenTitle = res.getString(R.string.screen_pinning_title); result.add(data); - // Screen pinning description. - data = new SearchIndexableRaw(context); - data.title = res.getString(R.string.screen_pinning_description); - data.screenTitle = res.getString(R.string.screen_pinning_title); - result.add(data); + if (isLockToAppEnabled(context)) { + // Screen lock option + data = new SearchIndexableRaw(context); + data.title = res.getString(R.string.screen_pinning_unlock_none); + data.screenTitle = res.getString(R.string.screen_pinning_title); + result.add(data); + } else { + // Screen pinning description. + data = new SearchIndexableRaw(context); + data.title = res.getString(R.string.screen_pinning_description); + data.screenTitle = res.getString(R.string.screen_pinning_title); + result.add(data); + } return result; } |