Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev

This commit is contained in:
TreeHugger Robot
2017-07-07 02:02:51 +00:00
committed by Android (Google) Code Review
7 changed files with 11 additions and 4 deletions

View File

@@ -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(