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

Commit 966a29dc authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Improved talkback fingerprint enrollment flow" into mnc-dev

parents 9dd754e1 e5fc0bae

src/com/android/settings/fingerprint/FingerprintEnrollBase.java

+17 −1
Original line number Original line Diff line number Diff line
@@ -22,9 +22,11 @@ import android.content.Intent; 
import android.graphics.Color;

import android.graphics.Color;

import android.hardware.fingerprint.FingerprintManager;

import android.hardware.fingerprint.FingerprintManager;

import android.os.Bundle;

import android.os.Bundle;

import android.text.TextUtils;

import android.view.View;

import android.view.View;

import android.view.WindowManager;

import android.view.WindowManager;

import android.widget.Button;

import android.widget.Button;

import android.widget.TextView;





import com.android.settings.ChooseLockSettingsHelper;

import com.android.settings.ChooseLockSettingsHelper;

import com.android.settings.R;

import com.android.settings.R;
@@ -93,8 +95,22 @@ public class FingerprintEnrollBase extends Activity implements View.OnClickListe 
        return (SetupWizardLayout) findViewById(R.id.setup_wizard_layout);

        return (SetupWizardLayout) findViewById(R.id.setup_wizard_layout);

    }

    }





    protected void setHeaderText(int resId, boolean force) {

        TextView layoutTitle = (TextView) getSetupWizardLayout().findViewById(

                R.id.suw_layout_title);

        CharSequence previousTitle = layoutTitle.getText();

        CharSequence title = getText(resId);

        if (previousTitle != title || force) {

            if (!TextUtils.isEmpty(previousTitle)) {

                layoutTitle.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);

            }

            getSetupWizardLayout().setHeaderText(title);

            setTitle(title);

        }

    }



    protected void setHeaderText(int resId) {

    protected void setHeaderText(int resId) {

        getSetupWizardLayout().setHeaderText(getText(resId));

        setHeaderText(resId, false /* force */);

    }

    }





    protected Button getNextButton() {

    protected Button getNextButton() {

src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -227,7 +227,8 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase 
            mStartMessage.setVisibility(View.VISIBLE);

            mStartMessage.setVisibility(View.VISIBLE);

            mRepeatMessage.setVisibility(View.INVISIBLE);

            mRepeatMessage.setVisibility(View.INVISIBLE);

        } else {

        } else {

            setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title);

            setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title,

                    true /* force */);

            mStartMessage.setVisibility(View.INVISIBLE);

            mStartMessage.setVisibility(View.INVISIBLE);

            mRepeatMessage.setVisibility(View.VISIBLE);

            mRepeatMessage.setVisibility(View.VISIBLE);

        }

        }