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

Commit 2b318b3b authored by Curtis Belmonte's avatar Curtis Belmonte Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp 

* changes:
  [automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c4
  Remove/replace old fingerprint icon in SUW/Settings
parents 87259ab2 dbef2415

res/drawable/ic_fingerprint_24dp.xml

+5 −4
Original line number Diff line number Diff line
@@ -16,10 +16,11 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:pathData="M17.81,4.47c-0.08,0 -0.16,-0.02 -0.23,-0.06C15.66,3.42 14,3 12.01,3c-1.98,0 -3.86,0.47 -5.57,1.41 -0.24,0.13 -0.54,0.04 -0.68,-0.2 -0.13,-0.24 -0.04,-0.55 0.2,-0.68C7.82,2.52 9.86,2 12.01,2c2.13,0 3.99,0.47 6.03,1.52 0.25,0.13 0.34,0.43 0.21,0.67 -0.09,0.18 -0.26,0.28 -0.44,0.28zM3.5,9.72c-0.1,0 -0.2,-0.03 -0.29,-0.09 -0.23,-0.16 -0.28,-0.47 -0.12,-0.7 0.99,-1.4 2.25,-2.5 3.75,-3.27C9.98,4.04 14,4.03 17.15,5.65c1.5,0.77 2.76,1.86 3.75,3.25 0.16,0.22 0.11,0.54 -0.12,0.7 -0.23,0.16 -0.54,0.11 -0.7,-0.12 -0.9,-1.26 -2.04,-2.25 -3.39,-2.94 -2.87,-1.47 -6.54,-1.47 -9.4,0.01 -1.36,0.7 -2.5,1.7 -3.4,2.96 -0.08,0.14 -0.23,0.21 -0.39,0.21zM9.75,21.79c-0.13,0 -0.26,-0.05 -0.35,-0.15 -0.87,-0.87 -1.34,-1.43 -2.01,-2.64 -0.69,-1.23 -1.05,-2.73 -1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66,2.42 5.66,5.39c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5c0,-2.42 -2.09,-4.39 -4.66,-4.39 -2.57,0 -4.66,1.97 -4.66,4.39 0,1.44 0.32,2.77 0.93,3.85 0.64,1.15 1.08,1.64 1.85,2.42 0.19,0.2 0.19,0.51 0,0.71 -0.11,0.1 -0.24,0.15 -0.37,0.15zM16.92,19.94c-1.19,0 -2.24,-0.3 -3.1,-0.89 -1.49,-1.01 -2.38,-2.65 -2.38,-4.39 0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,1.41 0.72,2.74 1.94,3.56 0.71,0.48 1.54,0.71 2.54,0.71 0.24,0 0.64,-0.03 1.04,-0.1 0.27,-0.05 0.53,0.13 0.58,0.41 0.05,0.27 -0.13,0.53 -0.41,0.58 -0.57,0.11 -1.07,0.12 -1.21,0.12zM14.91,22c-0.04,0 -0.09,-0.01 -0.13,-0.02 -1.59,-0.44 -2.63,-1.03 -3.72,-2.1 -1.4,-1.39 -2.17,-3.24 -2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7,0 3.08,1.32 3.08,2.94 0,1.07 0.93,1.94 2.08,1.94s2.08,-0.87 2.08,-1.94c0,-3.77 -3.25,-6.83 -7.25,-6.83 -2.84,0 -5.44,1.58 -6.61,4.03 -0.39,0.81 -0.59,1.76 -0.59,2.8 0,0.78 0.07,2.01 0.67,3.61 0.1,0.26 -0.03,0.55 -0.29,0.64 -0.26,0.1 -0.55,-0.04 -0.64,-0.29 -0.49,-1.31 -0.73,-2.61 -0.73,-3.96 0,-1.2 0.23,-2.29 0.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55,0 8.25,3.51 8.25,7.83 0,1.62 -1.38,2.94 -3.08,2.94s-3.08,-1.32 -3.08,-2.94c0,-1.07 -0.93,-1.94 -2.08,-1.94s-2.08,0.87 -2.08,1.94c0,1.71 0.66,3.31 1.87,4.51 0.95,0.94 1.86,1.46 3.27,1.85 0.27,0.07 0.42,0.35 0.35,0.61 -0.05,0.23 -0.26,0.38 -0.47,0.38z"

        android:fillColor="#000000"/>

        android:pathData="M7.3122,4.6691C8.6549,3.9318 10.2631,3.5 11.9979,3.5C13.7326,3.5 15.3409,3.9318 16.6835,4.6691C17.0466,4.8684 17.5026,4.7357 17.7019,4.3727C17.9013,4.0096 17.7686,3.5536 17.4055,3.3543C15.838,2.4935 13.9808,2 11.9979,2C10.0149,2 8.1578,2.4935 6.5902,3.3543C6.2271,3.5536 6.0944,4.0096 6.2938,4.3727C6.4932,4.7357 6.9491,4.8684 7.3122,4.6691ZM6.8614,14.8781C6.862,12.3662 9.0049,10.2292 11.9992,10.2292C14.9939,10.2292 17.137,12.3668 17.137,14.8791V15.0389C17.137,15.735 16.5727,16.2992 15.8767,16.2992C15.3591,16.2992 14.9045,15.9899 14.7153,15.5116L14.7142,15.509L14.0424,13.8294L14.0418,13.828C13.6244,12.7746 12.6064,12.0936 11.4861,12.0936C9.9616,12.0936 8.7258,13.3294 8.7258,14.8539C8.7258,16.4681 9.4592,18.005 10.7237,19.0147L10.7237,19.0147L10.7295,19.0192L11.1164,19.322C11.4426,19.5773 11.914,19.5198 12.1692,19.1936C12.4245,18.8674 12.367,18.396 12.0409,18.1408L11.657,17.8403C10.7531,17.1173 10.2258,16.0141 10.2258,14.8539C10.2258,14.1578 10.79,13.5936 11.4861,13.5936C11.9971,13.5936 12.459,13.9045 12.6475,14.3812L12.6486,14.3838L13.3204,16.0634L13.321,16.0649C13.7377,17.1165 14.7462,17.7992 15.8767,17.7992C17.4012,17.7992 18.637,16.5634 18.637,15.0389V14.8791C18.637,11.4364 15.7165,8.7292 11.9992,8.7292C8.2818,8.7292 5.3614,11.4364 5.3614,14.8791H6.1114C5.3614,14.8791 5.3614,14.8792 5.3614,14.8794L5.3614,14.8797L5.3614,14.8803L5.3614,14.882L5.3614,14.8865L5.3615,14.9002C5.3617,14.9114 5.3619,14.9268 5.3624,14.9459C5.3633,14.9842 5.365,15.0379 5.3684,15.1047C5.3752,15.2382 5.3885,15.4256 5.415,15.6487C5.4674,16.0908 5.5735,16.6934 5.7925,17.3028C5.9326,17.6926 6.3622,17.8951 6.752,17.755C7.1418,17.6149 7.3442,17.1853 7.2041,16.7955C7.0362,16.3283 6.9489,15.8459 6.9046,15.4721C6.8826,15.2873 6.8718,15.134 6.8665,15.0288C6.8638,14.9764 6.8625,14.9362 6.8619,14.9105L6.8615,14.8831L6.8614,14.8791H6.1114C6.8614,14.8791 6.8614,14.879 6.8614,14.8789V14.8781ZM11.9985,6.8631C9.2417,6.8631 6.9467,8.145 5.9123,9.8642C5.6987,10.2192 5.2379,10.3338 4.883,10.1202C4.528,9.9067 4.4134,9.4458 4.627,9.0909C5.9813,6.8401 8.8171,5.3631 11.9985,5.3631C15.18,5.3631 18.0157,6.8401 19.3701,9.0909C19.5836,9.4458 19.469,9.9067 19.1141,10.1202C18.7592,10.3338 18.2983,10.2192 18.0848,9.8642C17.0503,8.145 14.7553,6.8631 11.9985,6.8631ZM8.3064,19.0229C8.0034,18.7404 7.5288,18.7571 7.2463,19.06C6.9639,19.363 6.9805,19.8376 7.2835,20.12C8.5306,21.2828 10.182,22.0037 12.0005,22.0037C13.8189,22.0037 15.4703,21.2828 16.7175,20.12C17.0204,19.8376 17.037,19.363 16.7546,19.06C16.4721,18.7571 15.9975,18.7404 15.6946,19.0229C14.7044,19.9461 13.4119,20.5037 12.0005,20.5037C10.5891,20.5037 9.2965,19.9461 8.3064,19.0229Z"

        android:fillColor="#000000"

        android:fillType="evenOdd"/>

</vector>

src/com/android/settings/password/ChooseLockPassword.java

+1 −7
Original line number Diff line number Diff line
@@ -499,13 +499,7 @@ public class ChooseLockPassword extends SettingsActivity { 
            mNextButton = mixin.getPrimaryButton();



            mMessage = view.findViewById(R.id.sud_layout_description);

            if (mForFingerprint) {

                mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_fingerprint_header));

            } else if (mForFace) {

                mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_face_header));

            } else if (mForBiometrics) {

            mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_lock));

            }



            mIsAlphaMode = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == mPasswordType

                    || DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == mPasswordType

src/com/android/settings/password/ChooseLockPattern.java

+1 −7
Original line number Diff line number Diff line
@@ -505,14 +505,8 @@ public class ChooseLockPattern extends SettingsActivity { 
                    layout.getMixin(IconMixin.class).setVisibility(View.GONE);

                }

            } else {

                if (mForFingerprint) {

                    layout.setIcon(getActivity().getDrawable(R.drawable.ic_fingerprint_header));

                } else if (mForFace) {

                    layout.setIcon(getActivity().getDrawable(R.drawable.ic_face_header));

                } else if (mForBiometrics) {

                layout.setIcon(getActivity().getDrawable(R.drawable.ic_lock));

            }

            }



            final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);

            mixin.setSecondaryButton(

tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java

+0 −12
Original line number Diff line number Diff line
@@ -404,18 +404,6 @@ public class ChooseLockPasswordTest { 
                "Must be fewer than 17 characters");

    }



    @Test

    public void assertThat_chooseLockIconChanged_WhenFingerprintExtraSet() {

        ShadowDrawable drawable = setActivityAndGetIconDrawable(true);

        assertThat(drawable.getCreatedFromResId()).isEqualTo(R.drawable.ic_fingerprint_header);

    }



    @Test

    public void assertThat_chooseLockIconNotChanged_WhenFingerprintExtraSet() {

        ShadowDrawable drawable = setActivityAndGetIconDrawable(false);

        assertThat(drawable.getCreatedFromResId()).isNotEqualTo(R.drawable.ic_fingerprint_header);

    }



    @Test

    public void validateComplexityMergedFromDpmOnCreate() {

        ShadowLockPatternUtils.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_LOW);

tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java

+0 −13
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ import com.android.settings.R; 
import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;

import com.android.settings.password.ChooseLockPattern.IntentBuilder;

import com.android.settings.testutils.shadow.ShadowUtils;

import com.android.settingslib.testutils.DrawableTestHelper;



import com.google.android.setupdesign.GlifLayout;



import org.junit.Test;

import org.junit.runner.RunWith;
@@ -99,16 +96,6 @@ public class ChooseLockPatternTest { 
                .isNotNull();

    }



    @Config(qualifiers = "sw400dp")

    @Test

    public void fingerprintExtraSet_shouldDisplayFingerprintIcon() {

        ChooseLockPattern activity = createActivity(true);

        ChooseLockPatternFragment fragment = (ChooseLockPatternFragment)

                activity.getSupportFragmentManager().findFragmentById(R.id.main_content);

        DrawableTestHelper.assertDrawableResId(((GlifLayout) fragment.getView()).getIcon(),

                R.drawable.ic_fingerprint_header);

    }



    @Config(qualifiers = "sw300dp")

    @Test

    public void smallScreens_shouldHideIcon() {