Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 685ecb9d authored by lbill's avatar lbill Committed by Bill Lin
Browse files

Config BiometricEnrollBase#setHeaderText layoutTitle.hyphenationFrequency 

The title text sometimes breaks line with hypens on the
es, pt-PT, pt-BR, de, fr, sk locales

Flag: EXEMPT  for L10N bug fix
Bug: 391820733
Bug: 408386834
Test: Config display size and font size as largest
manual change locale and go to fingerprint enroll page
check the title do not break line with hypens
Test: atest SettingsRoboTests:com.android.settings.biometrics.fingerprint

Change-Id: I41a1e2b04f93d776543836a01cb46bb4557f69ea
parent 4ee80ae4

src/com/android/settings/biometrics/BiometricEnrollBase.java

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.graphics.Color; 
import android.os.Bundle;

import android.os.SystemClock;

import android.os.UserHandle;

import android.text.Layout;

import android.text.TextUtils;

import android.util.Log;

import android.view.View;
@@ -324,6 +325,7 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity { 


    protected void setHeaderText(int resId, boolean force) {

        TextView layoutTitle = getLayout().getHeaderTextView();

        layoutTitle.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE);

        CharSequence previousTitle = layoutTitle.getText();

        CharSequence title = getText(resId);

        if (previousTitle != title || force) {

tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.settings.biometrics.fingerprint; 
import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_POWER_BUTTON;

import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_REAR;

import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_OPTICAL;

import static android.text.Layout.HYPHENATION_FREQUENCY_NORMAL;

import static android.text.Layout.HYPHENATION_FREQUENCY_NONE;



import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_FINISHED;

import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_SKIP;
@@ -573,12 +573,12 @@ public class FingerprintEnrollFindSensorTest { 
    }



    @Test

    public void fingerprintEnrollFindSensor_setHyphenationFrequencyNormalOnHeader() {

    public void fingerprintEnrollFindSensor_setHyphenationFrequencyNoneOnHeader() {

        setupActivity_onUdfpsDevice();

        PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout);

        final TextView textView = layout.getMixin(HeaderMixin.class).getTextView();



        assertThat(textView.getHyphenationFrequency()).isEqualTo(HYPHENATION_FREQUENCY_NORMAL);

        assertThat(textView.getHyphenationFrequency()).isEqualTo(HYPHENATION_FREQUENCY_NONE);

    }



    private void triggerEnrollProgressAndError_onRearDevice() {