diff options
author | Danielle Millett <dmillett@google.com> | 2012-06-08 14:18:05 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-08 14:18:05 -0700 |
commit | acd377718479fe0d4f093c2f2f5326e59e31ff63 (patch) | |
tree | ff9be1a205becffa7d55c14db0d240cd87f7cb34 /src | |
parent | b3a049f5392da8500befaf2595f5170cf04cc432 (diff) | |
parent | 4a3e40d68e8b01871121655456d7a1dfa3312f71 (diff) | |
download | packages_apps_settings-acd377718479fe0d4f093c2f2f5326e59e31ff63.zip packages_apps_settings-acd377718479fe0d4f093c2f2f5326e59e31ff63.tar.gz packages_apps_settings-acd377718479fe0d4f093c2f2f5326e59e31ff63.tar.bz2 |
Merge "Removing head turn and putting blink back" into jb-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/settings/BiometricWeakLiveliness.java | 136 | ||||
-rw-r--r-- | src/com/android/settings/SecuritySettings.java | 36 |
2 files changed, 31 insertions, 141 deletions
diff --git a/src/com/android/settings/BiometricWeakLiveliness.java b/src/com/android/settings/BiometricWeakLiveliness.java deleted file mode 100644 index 6bba77f..0000000 --- a/src/com/android/settings/BiometricWeakLiveliness.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings; - -import android.app.ActionBar; -import android.app.Activity; -import android.app.Fragment; -import android.os.Bundle; -import android.os.Handler; -import android.content.Intent; -import android.preference.PreferenceActivity; -import android.util.Log; -import android.view.Gravity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.CompoundButton; -import android.widget.Switch; -import com.android.settings.R; - -import com.android.internal.widget.LockPatternUtils; - -public class BiometricWeakLiveliness extends Fragment - implements CompoundButton.OnCheckedChangeListener { - private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF = 125; - - private View mView; - private ChooseLockSettingsHelper mChooseLockSettingsHelper; - private LockPatternUtils mLockPatternUtils; - private Switch mActionBarSwitch; - private boolean mSuppressCheckChanged; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - Activity activity = getActivity(); - - mActionBarSwitch = new Switch(activity); - mSuppressCheckChanged = false; - - if (activity instanceof PreferenceActivity) { - PreferenceActivity preferenceActivity = (PreferenceActivity) activity; - if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) { - final int padding = activity.getResources().getDimensionPixelSize( - R.dimen.action_bar_switch_padding); - mActionBarSwitch.setPadding(0, 0, padding, 0); - activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, - ActionBar.DISPLAY_SHOW_CUSTOM); - activity.getActionBar().setCustomView(mActionBarSwitch, new ActionBar.LayoutParams( - ActionBar.LayoutParams.WRAP_CONTENT, - ActionBar.LayoutParams.WRAP_CONTENT, - Gravity.CENTER_VERTICAL | Gravity.RIGHT)); - activity.getActionBar().setTitle(R.string.biometric_weak_liveliness_title); - } - } - - mActionBarSwitch.setOnCheckedChangeListener(this); - - mLockPatternUtils = new LockPatternUtils(getActivity()); - mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity()); - mActionBarSwitch.setChecked(mLockPatternUtils.isBiometricWeakLivelinessEnabled()); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - mView = inflater.inflate(R.layout.biometric_weak_liveliness, container, false); - initView(mView); - return mView; - } - - private void initView(View view) { - mActionBarSwitch.setOnCheckedChangeListener(this); - mActionBarSwitch.setChecked(mLockPatternUtils.isBiometricWeakLivelinessEnabled()); - } - - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean desiredState) { - if (mSuppressCheckChanged) { - return; - } - mActionBarSwitch.setEnabled(false); - if (desiredState) { - mLockPatternUtils.setBiometricWeakLivelinessEnabled(true); - mActionBarSwitch.setChecked(true); - } else { - // In this case the user has just turned it off, but this action requires them - // to confirm their password. We need to turn the switch back on until - // they've confirmed their password - mActionBarSwitch.setChecked(true); - mActionBarSwitch.requestLayout(); - ChooseLockSettingsHelper helper = - new ChooseLockSettingsHelper(this.getActivity(), this); - if (!helper.launchConfirmationActivity( - CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF, null, null)) { - // If this returns false, it means no password confirmation is required, so - // go ahead and turn it off here. - // Note: currently a backup is required for biometric_weak so this code path - // can't be reached, but is here in case things change in the future - mLockPatternUtils.setBiometricWeakLivelinessEnabled(false); - mActionBarSwitch.setChecked(false); - mActionBarSwitch.requestLayout(); - } - } - mActionBarSwitch.setEnabled(true); - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (requestCode == CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF && - resultCode == Activity.RESULT_OK) { - final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils(); - lockPatternUtils.setBiometricWeakLivelinessEnabled(false); - mSuppressCheckChanged = true; - mActionBarSwitch.setChecked(false); - mSuppressCheckChanged = false; - return; - } - } - -} diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 6b67730..a12da3e 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -62,6 +62,7 @@ public class SecuritySettings extends SettingsPreferenceFragment private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout"; private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123; private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST = 124; + private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF = 125; // Misc Settings private static final String KEY_SIM_LOCK = "sim_lock"; @@ -76,7 +77,7 @@ public class SecuritySettings extends SettingsPreferenceFragment private LockPatternUtils mLockPatternUtils; private ListPreference mLockAfter; - private PreferenceScreen mBiometricWeakLiveliness; + private CheckBoxPreference mBiometricWeakLiveliness; private CheckBoxPreference mVisiblePattern; private CheckBoxPreference mTactileFeedback; @@ -162,7 +163,7 @@ public class SecuritySettings extends SettingsPreferenceFragment // biometric weak liveliness mBiometricWeakLiveliness = - (PreferenceScreen) root.findPreference(KEY_BIOMETRIC_WEAK_LIVELINESS); + (CheckBoxPreference) root.findPreference(KEY_BIOMETRIC_WEAK_LIVELINESS); // visible pattern mVisiblePattern = (CheckBoxPreference) root.findPreference(KEY_VISIBLE_PATTERN); @@ -338,9 +339,8 @@ public class SecuritySettings extends SettingsPreferenceFragment final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils(); if (mBiometricWeakLiveliness != null) { - mBiometricWeakLiveliness.setSummary(lockPatternUtils.isBiometricWeakLivelinessEnabled()? - R.string.biometric_weak_liveliness_on_summary: - R.string.biometric_weak_liveliness_off_summary); + mBiometricWeakLiveliness.setChecked( + lockPatternUtils.isBiometricWeakLivelinessEnabled()); } if (mVisiblePattern != null) { mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled()); @@ -382,6 +382,26 @@ public class SecuritySettings extends SettingsPreferenceFragment // can't be reached, but is here in case things change in the future startBiometricWeakImprove(); } + } else if (KEY_BIOMETRIC_WEAK_LIVELINESS.equals(key)) { + if (isToggled(preference)) { + lockPatternUtils.setBiometricWeakLivelinessEnabled(true); + } else { + // In this case the user has just unchecked the checkbox, but this action requires + // them to confirm their password. We need to re-check the checkbox until + // they've confirmed their password + mBiometricWeakLiveliness.setChecked(true); + ChooseLockSettingsHelper helper = + new ChooseLockSettingsHelper(this.getActivity(), this); + if (!helper.launchConfirmationActivity( + CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF, null, null)) { + // If this returns false, it means no password confirmation is required, so + // go ahead and uncheck it here. + // Note: currently a backup is required for biometric_weak so this code path + // can't be reached, but is here in case things change in the future + lockPatternUtils.setBiometricWeakLivelinessEnabled(false); + mBiometricWeakLiveliness.setChecked(false); + } + } } else if (KEY_LOCK_ENABLED.equals(key)) { lockPatternUtils.setLockPatternEnabled(isToggled(preference)); } else if (KEY_VISIBLE_PATTERN.equals(key)) { @@ -422,6 +442,12 @@ public class SecuritySettings extends SettingsPreferenceFragment resultCode == Activity.RESULT_OK) { startBiometricWeakImprove(); return; + } else if (requestCode == CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF && + resultCode == Activity.RESULT_OK) { + final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils(); + lockPatternUtils.setBiometricWeakLivelinessEnabled(false); + mBiometricWeakLiveliness.setChecked(false); + return; } createPreferenceHierarchy(); } |