From ccbb4cfc2c3884389aecbe7c096d796fee8d3fc2 Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Thu, 6 Jul 2017 14:30:28 -0700
Subject: [PATCH] Use config_headlineFontFamily for password screens.

These screens are used whenever setting or confirming the
lockscreen PIN or password. Set them to a consistent textSize (24sp)
and a consistent fontFamily.

Would have set the fontFamily in the style, but unfortunately
setInputType is called on the TextViews after inflation which blows
away the fontFamily. Instead, we set it in code right after that
call.

Change-Id: I77c3f94e2b1ce6d1f19697394c5caa09aac423b0
Fixes: 62873478
Test: manual
---
 res/layout-land/confirm_lock_password.xml                  | 1 -
 res/layout/choose_lock_password.xml                        | 1 -
 res/layout/confirm_lock_password_base.xml                  | 1 -
 res/layout/confirm_lock_password_internal.xml              | 1 -
 res/values/styles.xml                                      | 1 +
 src/com/android/settings/password/ChooseLockPassword.java  | 5 +++++
 src/com/android/settings/password/ConfirmLockPassword.java | 5 +++++
 7 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index 0cc9339aa2e..218192c21d7 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -76,7 +76,6 @@
                     android:inputType="textPassword"
                     android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
                     android:gravity="center"
-                    android:textSize="16sp"
                     style="@style/TextAppearance.PasswordEntry"/>
 
                 <TextView style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index 082d6c971b2..7ce30344d58 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -59,7 +59,6 @@
                 android:gravity="center"
                 android:inputType="textPassword"
                 android:imeOptions="actionNext|flagNoExtractUi|flagForceAscii"
-                android:textSize="24sp"
                 style="@style/TextAppearance.PasswordEntry"/>
 
             <android.support.v7.widget.RecyclerView
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index 0c65e86b7f1..05e90d223d6 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -76,7 +76,6 @@
                 android:inputType="textPassword"
                 android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
                 android:gravity="center"
-                android:textSize="16sp"
                 style="@style/TextAppearance.PasswordEntry"/>
 
             <TextView
diff --git a/res/layout/confirm_lock_password_internal.xml b/res/layout/confirm_lock_password_internal.xml
index 701ff57c8f9..558522cf96c 100644
--- a/res/layout/confirm_lock_password_internal.xml
+++ b/res/layout/confirm_lock_password_internal.xml
@@ -54,7 +54,6 @@
                 android:inputType="textPassword"
                 android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
                 android:gravity="center"
-                android:textSize="16sp"
                 style="@style/TextAppearance.PasswordEntry"/>
 
             <TextView
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 398bdbd1544..e40850d5ac2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -79,6 +79,7 @@
         <item name="android:gravity">center</item>
         <item name="android:singleLine">true</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textSize">24sp</item>
     </style>
 
     <style name="TextAppearance.CryptKeeper_PasswordEntry" parent="android:TextAppearance.Material">
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index b646360b213..66b01a93567 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -30,6 +30,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources.Theme;
 import android.graphics.Insets;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -375,6 +376,10 @@ public class ChooseLockPassword extends SettingsActivity {
             int currentType = mPasswordEntry.getInputType();
             mPasswordEntry.setInputType(mIsAlphaMode ? currentType
                     : (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
+            // Can't set via XML since setInputType resets the fontFamily to null
+            mPasswordEntry.setTypeface(Typeface.create(
+                    getContext().getString(com.android.internal.R.string.config_headlineFontFamily),
+                    Typeface.NORMAL));
 
             Intent intent = getActivity().getIntent();
             final boolean confirmCredentials = intent.getBooleanExtra(
diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
index f48ec96a51c..853ab36b297 100644
--- a/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -20,6 +20,7 @@ import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Typeface;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.CountDownTimer;
@@ -172,6 +173,10 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
             int currentType = mPasswordEntry.getInputType();
             mPasswordEntry.setInputType(mIsAlpha ? currentType
                     : (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
+            // Can't set via XML since setInputType resets the fontFamily to null
+            mPasswordEntry.setTypeface(Typeface.create(
+                    getContext().getString(com.android.internal.R.string.config_headlineFontFamily),
+                    Typeface.NORMAL));
             mAppearAnimationUtils = new AppearAnimationUtils(getContext(),
                     220, 2f /* translationScale */, 1f /* delayScale*/,
                     AnimationUtils.loadInterpolator(getContext(),