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

Commit b3146b00 authored by Tony Mak's avatar Tony Mak Committed by Android (Google) Code Review
Browse files

Merge "New UI to hint user about strong auth" into nyc-dev

parents 498ec55b 7655be05

res/layout/confirm_lock_password_base.xml

+3 −9
Original line number Diff line number Diff line
@@ -59,15 +59,9 @@ 
            android:layout_marginEnd="16dp"

            android:layout_marginTop="16dp"/>



        <TextView

            android:id="@+id/strongAuthRequiredText"

            style="@style/TextAppearance.ConfirmDeviceCredentialsStrongAuthRequiredText"

            android:layout_width="match_parent"

        <View android:layout_width="match_parent"

              android:layout_height="0dp"

            android:layout_weight="1"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:gravity="center"/>

              android:layout_weight="1"/>



        <EditText

            android:id="@+id/password_entry"

res/layout/confirm_lock_pattern_base.xml

+3 −9
Original line number Diff line number Diff line
@@ -59,15 +59,9 @@ 
            android:layout_marginEnd="16dp"

            android:layout_marginTop="16dp"/>



        <TextView

            android:id="@+id/strongAuthRequiredText"

            style="@style/TextAppearance.ConfirmDeviceCredentialsStrongAuthRequiredText"

            android:layout_width="match_parent"

        <View android:layout_width="match_parent"

              android:layout_height="0dp"

            android:layout_weight="0.5"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:gravity="center"/>

              android:layout_weight="0.5"/>



        <com.android.internal.widget.LockPatternView

            android:id="@+id/lockPattern"

res/values/strings.xml

+10 −3
Original line number Diff line number Diff line
@@ -3077,13 +3077,20 @@ 
    <!-- Message to be used to explain the user that he needs to enter his work password to continue a

         particular operation. [CHAR LIMIT=70]-->

    <string name="lockpassword_confirm_your_password_generic_profile">Enter your work password to continue</string>









    <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->









    <string name="lockpassword_strong_auth_required_reason_restart_pattern">Pattern required after device restarts</string>









    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern">Use your device pattern to continue. It\'s required after the device restarts.</string>









    <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->









    <string name="lockpassword_strong_auth_required_reason_restart_pin">PIN required after device restarts</string>









    <string name="lockpassword_strong_auth_required_reason_restart_device_pin">Enter your device PIN to continue. It\'s required after the device restarts.</string>









    <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->









    <string name="lockpassword_strong_auth_required_reason_restart_device_password">Enter your device password to continue. It\'s required after the device restarts.</string>

















    <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->









    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern">Use your work pattern to continue. It\'s required after the device restarts.</string>









    <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->









    <string name="lockpassword_strong_auth_required_reason_restart_work_pin">Enter your work PIN to continue. It\'s required after the device restarts.</string>









    <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->









    <string name="lockpassword_strong_auth_required_reason_restart_password">Password required after device restarts</string>









    <string name="lockpassword_strong_auth_required_reason_restart_work_password">Enter your work password to continue. It\'s required after the device restarts.</string>

















    <!-- Security & location settings screen, change security method screen instruction if user









         enters incorrect PIN [CHAR LIMIT=30] -->
































res/values/styles.xml



+0
−5






























Original line number
Diff line number
Diff line







@@ -357,11 +357,6 @@







        <item name="android:textColor">@color/warning</item>









    </style>



















    <style name="TextAppearance.ConfirmDeviceCredentialsStrongAuthRequiredText"









        parent="android:TextAppearance.Material.Body1">









        <item name="android:textColor">?android:attr/textColorSecondary</item>









    </style>



















    <style name="TextAppearance.Small.SwitchBar">









        <item name="android:textColor">?android:attr/textColorPrimary</item>









        <item name="android:textStyle">normal</item>
































src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java



+1
−7






























Original line number
Diff line number
Diff line







@@ -66,7 +66,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra







            PACKAGE + ".ConfirmCredentials.showWhenLocked";



















    private FingerprintUiHelper mFingerprintHelper;









    private boolean mIsStrongAuthRequired;









    protected boolean mIsStrongAuthRequired;









    private boolean mAllowFpAuthentication;









    protected Button mCancelButton;









    protected ImageView mFingerprintIcon;








@@ -74,7 +74,6 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra







    protected int mUserId;









    protected LockPatternUtils mLockPatternUtils;









    protected TextView mErrorTextView;









    protected TextView mStrongAuthRequiredTextView;









    protected final Handler mHandler = new Handler();



















    @Override








@@ -97,11 +96,6 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra







    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {









        super.onViewCreated(view, savedInstanceState);









        mCancelButton = (Button) view.findViewById(R.id.cancelButton);









        if (mStrongAuthRequiredTextView != null) {









            // INIVISIBLE instead of GONE because it also acts as a weighted spacer









            mStrongAuthRequiredTextView.setVisibility(









                    mIsStrongAuthRequired ? View.VISIBLE : View.INVISIBLE);









        }









        mFingerprintIcon = (ImageView) view.findViewById(R.id.fingerprintIcon);









        mFingerprintHelper = new FingerprintUiHelper(









                mFingerprintIcon,