PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Selim Cinek
2015-06-23 17:14:42 +00:00
committed by Android (Google) Code Review
parent 9dd754e1f4 e5fc0bae73
commit 966a29dc97
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/fingerprint/FingerprintEnrollBase.java
View File

@@ -22,9 +22,11 @@ import android.content.Intent;
import android.graphics.Color;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.TextView;
import com.android.settings.ChooseLockSettingsHelper;
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);
}
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) {
getSetupWizardLayout().setHeaderText(getText(resId));
setHeaderText(resId, false /* force */);
}
protected Button getNextButton() {

3
src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -227,7 +227,8 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
mStartMessage.setVisibility(View.VISIBLE);
mRepeatMessage.setVisibility(View.INVISIBLE);
} 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);
mRepeatMessage.setVisibility(View.VISIBLE);
}