Fix incorrect SetupChooseLockPattern layout

Root cause:
- The new added description TextView is too large
- sud_layout_description was add in sud_layout_content
  instead of sud_layout_header.

Solution:
- Set string lockpassword_choose_your_pattern_description
  to GlifLayout as it's description.(Header description)

Bug: 233666752
Fixes 239892091
Test: manual in setup flow, check choose lock pattern layouts
showing expectedly on both phone & tablet
Test: make RunSettingsRoboTests

Change-Id: Iabe503066434f8983dffb88d1c93f2bbf773b860
This commit is contained in:
lbill
2022-07-25 10:29:00 +00:00
parent 037cf476e7
commit 07b149ec51
3 changed files with 15 additions and 11 deletions

View File

@@ -27,6 +27,7 @@ import android.content.pm.PackageManager;
import android.os.UserHandle;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
@@ -192,6 +193,18 @@ public class SetupChooseLockPatternTest {
.isEqualTo(application.getString(R.string.lockpattern_retry_button_text));
}
@Test
public void createActivity_patternDescription_shouldBeShown() {
PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout);
final TextView patternDescription =
layout.findViewById(R.id.sud_layout_subtitle);
assertThat(patternDescription.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(patternDescription.getText()).isEqualTo(
application.getString(R.string.lockpassword_choose_your_pattern_description));
}
private ChooseLockPatternFragment findFragment(FragmentActivity activity) {
return (ChooseLockPatternFragment)
activity.getSupportFragmentManager().findFragmentById(R.id.main_content);