Add 'clear' button to pin/password lock screen

bug: 62904466
Test: Manually tested, added functional tests
Change-Id: I5f5555d99b47550a8fef6995222d12155b4072a9
This commit is contained in:
Ajay Nadathur
2017-08-02 14:46:26 -07:00
parent ce056636ef
commit be2246bee7
6 changed files with 149 additions and 7 deletions

View File

@@ -84,13 +84,6 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
if (mForFingerprint) {
mCancelButton.setVisibility(View.GONE);
} else {
mCancelButton.setText(R.string.skip_label);
}
final Activity activity = getActivity();
ChooseLockGenericController chooseLockGenericController =
new ChooseLockGenericController(activity, mUserId);
@@ -190,6 +183,12 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
@Override
protected void updateUi() {
super.updateUi();
if (mForFingerprint) {
mCancelButton.setVisibility(View.GONE);
} else {
mCancelButton.setText(R.string.skip_label);
}
if (mOptionsButton != null) {
mOptionsButton.setVisibility(
mUiStage == Stage.Introduction ? View.VISIBLE : View.GONE);