From dcce8fa662992b298a9c7448b01800dedb3fa228 Mon Sep 17 00:00:00 2001
From: Oli Thompson <olit@google.com>
Date: Fri, 9 Jun 2023 11:44:29 +0000
Subject: [PATCH] Fix emergency button not visible on pattern work challenge
 screen

Hide the subtext for work challenge pattern,so everything fits and
adjust some spacing

Test: btest a.d.g.WorkTelephonyTest#workChallengePatternScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Bug: 283137301
Bug: 286391641
Change-Id: Ia6214b624f8d7328f7445f01a08166b8ab33fdec
---
 res/layout/confirm_lock_pattern_base.xml      |  6 ++----
 .../confirm_lock_pattern_normal_base.xml      |  1 +
 .../settings/password/ConfirmLockPattern.java | 21 +++++--------------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml
index 01f028e1684..a0dfe7f8469 100644
--- a/res/layout/confirm_lock_pattern_base.xml
+++ b/res/layout/confirm_lock_pattern_base.xml
@@ -29,8 +29,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingBottom="24dp">
+            android:orientation="vertical">
 
             <Button
                 android:id="@+id/cancelButton"
@@ -87,6 +86,7 @@
                 android:paddingStart="?attr/sudMarginStart"
                 android:paddingEnd="?attr/sudMarginEnd"
                 android:layout_marginTop="12dp"
+                android:layout_marginBottom="12dp"
                 android:gravity="center_vertical"/>
 
             <Button
@@ -96,8 +96,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="?attr/sudMarginStart"
                 android:layout_marginEnd="?attr/sudMarginEnd"
-                android:layout_marginTop="60dp"
-                android:layout_marginBottom="14dp"
                 android:visibility="gone"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/work_challenge_emergency_button_text"/>
diff --git a/res/layout/confirm_lock_pattern_normal_base.xml b/res/layout/confirm_lock_pattern_normal_base.xml
index 7997ca79d9d..fca7e75cf9c 100644
--- a/res/layout/confirm_lock_pattern_normal_base.xml
+++ b/res/layout/confirm_lock_pattern_normal_base.xml
@@ -61,6 +61,7 @@
                 android:layout_marginStart="?attr/sudMarginStart"
                 android:layout_marginEnd="?attr/sudMarginEnd"
                 android:layout_marginTop="12dp"
+                android:layout_marginBottom="12dp"
                 android:gravity="center_vertical"/>
 
             <CheckBox
diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
index 7db25fd830f..e99a986ebe6 100644
--- a/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -17,9 +17,7 @@
 package com.android.settings.password;
 
 import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PATTERN_HEADER;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PATTERN;
 import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LAST_PATTERN_ATTEMPT_BEFORE_WIPE;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PATTERN_REQUIRED;
 import static android.app.admin.DevicePolicyResources.UNDEFINED;
 
 import static com.android.settings.biometrics.GatekeeperPasswordProvider.containsGatekeeperPasswordHandle;
@@ -315,23 +313,12 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
                         R.string.lockpassword_remote_validation_pattern_details);
             }
             final boolean isStrongAuthRequired = isStrongAuthRequired();
-            if (mIsManagedProfile) {
-                if (isStrongAuthRequired) {
-                    return mDevicePolicyManager.getResources().getString(
-                            WORK_PROFILE_PATTERN_REQUIRED,
-                            () -> getString(
-                                    R.string.lockpassword_strong_auth_required_work_pattern));
-                } else {
-                    return mDevicePolicyManager.getResources().getString(
-                            WORK_PROFILE_CONFIRM_PATTERN,
-                            () -> getString(
-                                    R.string.lockpassword_confirm_your_pattern_generic_profile));
-                }
-            } else {
+            if (!mIsManagedProfile) {
                 return isStrongAuthRequired
                         ? getString(R.string.lockpassword_strong_auth_required_device_pattern)
                         : getString(R.string.lockpassword_confirm_your_pattern_generic);
             }
+            return null;
         }
 
         private Object[][] getActiveViews() {
@@ -381,7 +368,9 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
 
                     CharSequence detailsText =
                             mDetailsText == null ? getDefaultDetails() : mDetailsText;
-                    mGlifLayout.setDescriptionText(detailsText);
+                    if (detailsText != null) {
+                        mGlifLayout.setDescriptionText(detailsText);
+                    }
 
                     mErrorTextView.setText("");
                     updateErrorMessage(