From 44d5ad8a57490a8c74b6f9a83be72f51c5525357 Mon Sep 17 00:00:00 2001
From: Curtis Belmonte <curtislb@google.com>
Date: Mon, 27 Apr 2020 16:08:59 -0700
Subject: [PATCH] Condense landscape layout of auth credential password view

Changes the layout of the biometric prompt auth credential password
when in landscape orientation, in order to prevent the keyboard from
obscuring the password/PIN entry or error text views. Specifically:
- Removes the icon from the layout
- Reduces/removes padding and spacers

Test: CTS Verifier > Biometric Tests > 4a: Credential, Cipher
Test: Biometric support demo app

Fixes: 155041280
Change-Id: I8d576f76d2e90b1830a22aebbfc12559634b6b75
---
 .../auth_credential_password_view.xml         | 61 +++++++++++++++++++
 packages/SystemUI/res/values/styles.xml       |  4 +-
 .../biometrics/AuthCredentialView.java        | 19 +++---
 3 files changed, 74 insertions(+), 10 deletions(-)
 create mode 100644 packages/SystemUI/res/layout-land/auth_credential_password_view.xml

diff --git a/packages/SystemUI/res/layout-land/auth_credential_password_view.xml b/packages/SystemUI/res/layout-land/auth_credential_password_view.xml
new file mode 100644
index 0000000000000..d89f329039c66
--- /dev/null
+++ b/packages/SystemUI/res/layout-land/auth_credential_password_view.xml
@@ -0,0 +1,61 @@
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+
+<com.android.systemui.biometrics.AuthCredentialPasswordView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center_horizontal"
+    android:elevation="@dimen/biometric_dialog_elevation">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/TextAppearance.AuthCredential.Title"/>
+
+    <TextView
+        android:id="@+id/subtitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/TextAppearance.AuthCredential.Subtitle"/>
+
+    <TextView
+        android:id="@+id/description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/TextAppearance.AuthCredential.Description"/>
+
+    <EditText
+        android:id="@+id/lockPassword"
+        android:layout_width="208dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:minHeight="48dp"
+        android:gravity="center"
+        android:inputType="textPassword"
+        android:maxLength="500"
+        android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
+        style="@style/TextAppearance.AuthCredential.PasswordEntry"/>
+
+    <TextView
+        android:id="@+id/error"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/TextAppearance.AuthCredential.Error"/>
+
+</com.android.systemui.biometrics.AuthCredentialPasswordView>
\ No newline at end of file
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index f67bb6b79f37e..57d2040bed57c 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -258,7 +258,7 @@
 
     <style name="TextAppearance.AuthCredential.Title">
         <item name="android:fontFamily">google-sans</item>
-        <item name="android:paddingTop">16dp</item>
+        <item name="android:paddingTop">12dp</item>
         <item name="android:paddingHorizontal">24dp</item>
         <item name="android:textSize">24sp</item>
     </style>
@@ -278,7 +278,7 @@
     </style>
 
     <style name="TextAppearance.AuthCredential.Error">
-        <item name="android:paddingTop">12dp</item>
+        <item name="android:paddingTop">6dp</item>
         <item name="android:paddingHorizontal">24dp</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textColor">?android:attr/colorError</item>
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java
index 496e60ddf99ee..084b791a8dcd6 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java
@@ -220,15 +220,18 @@ public abstract class AuthCredentialView extends LinearLayout {
         setTextOrHide(mDescriptionView, getDescription(mBiometricPromptBundle));
         announceForAccessibility(title);
 
-        final boolean isManagedProfile = Utils.isManagedProfile(mContext, mEffectiveUserId);
-        final Drawable image;
-        if (isManagedProfile) {
-            image = getResources().getDrawable(R.drawable.auth_dialog_enterprise,
-                    mContext.getTheme());
-        } else {
-            image = getResources().getDrawable(R.drawable.auth_dialog_lock, mContext.getTheme());
+        if (mIconView != null) {
+            final boolean isManagedProfile = Utils.isManagedProfile(mContext, mEffectiveUserId);
+            final Drawable image;
+            if (isManagedProfile) {
+                image = getResources().getDrawable(R.drawable.auth_dialog_enterprise,
+                        mContext.getTheme());
+            } else {
+                image = getResources().getDrawable(R.drawable.auth_dialog_lock,
+                        mContext.getTheme());
+            }
+            mIconView.setImageDrawable(image);
         }
-        mIconView.setImageDrawable(image);
 
         // Only animate this if we're transitioning from a biometric view.
         if (mShouldAnimateContents) {