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

Merge "Update toggle logic"

Browse Source
This commit is contained in:
Kevin Chyn
2019-03-15 04:22:58 +00:00
committed by Android (Google) Code Review
parent 63820288ae 11679da53d
commit b697847430
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/biometrics/face/FaceEnrollAccessibilityToggle.java
View File

@@ -58,9 +58,14 @@ public class FaceEnrollAccessibilityToggle extends LinearLayout {
a.recycle(); a.recycle();
} }
mSwitch = findViewById(R.id.toggle); mSwitch = findViewById(R.id.toggle);
mSwitch.setChecked(false);
} }
public boolean isChecked() { public boolean isChecked() {
return mSwitch.isChecked(); return mSwitch.isChecked();
} }
public void setChecked(boolean checked) {
mSwitch.setChecked(checked);
}
} }

3
src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
View File

@@ -53,6 +53,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
final LinearLayout accessibilityLayout = findViewById(R.id.accessibility_layout); final LinearLayout accessibilityLayout = findViewById(R.id.accessibility_layout);
final Button accessibilityButton = findViewById(R.id.accessibility_button); final Button accessibilityButton = findViewById(R.id.accessibility_button);
accessibilityButton.setOnClickListener(view -> { accessibilityButton.setOnClickListener(view -> {
mSwitchDiversity.setChecked(true);
accessibilityButton.setVisibility(View.INVISIBLE); accessibilityButton.setVisibility(View.INVISIBLE);
accessibilityLayout.setVisibility(View.VISIBLE); accessibilityLayout.setVisibility(View.VISIBLE);
}); });
@@ -177,7 +178,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
} else { } else {
intent.setClass(this, FaceEnrollEnrolling.class); intent.setClass(this, FaceEnrollEnrolling.class);
} }
intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, mSwitchDiversity.isChecked()); intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, !mSwitchDiversity.isChecked());
WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent); WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);
return intent; return intent;
} }