Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7b5290e authored by Danielle Millett's avatar Danielle Millett Committed by The Android Automerger
Browse files

Removing head turn and putting blink back 

Changing the strings and workflow in settings to be blink again
instead of the new head turn.  This basically undoes the following
two cls: I67c8acd4 and Ifc7b6e18.

Change-Id: I8694b1d82efac9d2f97c29128da6698b6ac2a4ce
parent 235ec865

res/layout/biometric_weak_liveliness.xml

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- 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.

-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:paddingLeft="6dip"

    android:paddingRight="6dip"

    android:layout_width="match_parent" android:layout_height="wrap_content"

    android:scrollbars="vertical" >



    <ScrollView

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:fillViewport="true">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">



            <TextView android:id="@+id/biometric_weak_liveliness_explained"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="20dip"

                android:gravity="top"

                android:text="@string/biometric_weak_liveliness_explained"

                android:textAppearance="?android:attr/textAppearanceMedium"

            />

        </LinearLayout>



    </ScrollView>



</LinearLayout>

res/values/strings.xml

+3 −8
Original line number Diff line number Diff line
@@ -644,15 +644,10 @@ 


    <!-- Security settings screen when using face unlock, setting option name to start an activity that allows the user to improve accuracy by adding additional enrollment faces -->

    <string name="biometric_weak_improve_matching_title">Improve face matching</string>

    <!-- On the security settings screen when using face unlock.  This goes to a screen that explains liveliness detection and allows for it to be turned on/off -->

<!-- On the security settings screen when using face unlock.  This checkbox is used to toggle whether liveliness detection is required.  If it is checked the user must blink during unlock to prove it's not a photo  -->

    <string name="biometric_weak_liveliness_title">Liveness check</string>

    <!-- Used to describe the on state of the face unlock liveliness feature -->

    <string name="biometric_weak_liveliness_on_summary">On - head turn required to unlock</string>

    <!-- Used to describe the off state of the face unlock liveliness feature -->

    <string name="biometric_weak_liveliness_off_summary">Off</string>

    <!-- Explanation of the Face Unlock liveliness feature. It's displayed on a screen with an on/off toggle switch. -->

    <!-- Explanation of the Face Unlock liveliness feature. It's displayed on a screen with an on/off toggle switch. -->

    <string name="biometric_weak_liveliness_explained" product="default">To improve security, you\'ll be asked to turn your head while unlocking.  When prompted, turn to the left or right.</string>

    <!-- On the security settings screen when using face unlock.  The summary of the liveliness checkbox -->

    <string name="biometric_weak_liveliness_summary">Require eye blink while unlocking</string>



    <!-- Security settings screen, setting option name to change screen timeout -->

    <string name="lock_after_timeout">Automatically lock</string>

res/xml/security_settings_biometric_weak.xml

+3 −3
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ 
            android:key="biometric_weak_improve_matching"

            android:title="@string/biometric_weak_improve_matching_title"/>



        <PreferenceScreen

        <CheckBoxPreference

           android:key="biometric_weak_liveliness"

           android:fragment="com.android.settings.BiometricWeakLiveliness"

           android:title="@string/biometric_weak_liveliness_title"/>

           android:title="@string/biometric_weak_liveliness_title"

           android:summary="@string/biometric_weak_liveliness_summary"/>



        <CheckBoxPreference

            android:key="visiblepattern"

src/com/android/settings/BiometricWeakLiveliness.java

deleted100644 → 0
+0 −136
Original line number Diff line number Diff line 
/*

 * 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;

        }

    }



}

src/com/android/settings/SecuritySettings.java

+31 −5
Original line number Diff line number Diff line
@@ -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();

    }