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

Merge "Streamline accessibility flow"

Browse Source
This commit is contained in:
Kevin Chyn
2019-01-24 09:04:25 +00:00
committed by Android (Google) Code Review
parent 875178bbfa 05668ce78c
commit 8565334148
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/face_enroll_introduction.xml
View File

@@ -85,12 +85,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/> FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/>
<com.android.settings.biometrics.face.FaceEnrollAccessibilityToggle
android:id="@+id/toggle_vision"
android:layout_width="match_parent"
android:layout_height="wrap_content"
FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_vision"/>
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>

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

@@ -43,7 +43,6 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
private static final String TAG = "FaceIntro"; private static final String TAG = "FaceIntro";
private FaceManager mFaceManager; private FaceManager mFaceManager;
private FaceEnrollAccessibilityToggle mSwitchVision;
private FaceEnrollAccessibilityToggle mSwitchDiversity; private FaceEnrollAccessibilityToggle mSwitchDiversity;
@Override @Override
@@ -57,7 +56,6 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
accessibilityLayout.setVisibility(View.VISIBLE); accessibilityLayout.setVisibility(View.VISIBLE);
}); });
mSwitchVision = findViewById(R.id.toggle_vision);
mSwitchDiversity = findViewById(R.id.toggle_diversity); mSwitchDiversity = findViewById(R.id.toggle_diversity);
mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
@@ -167,7 +165,6 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
} else { } else {
intent.setClass(this, FaceEnrollEnrolling.class); intent.setClass(this, FaceEnrollEnrolling.class);
} }
intent.putExtra(EXTRA_KEY_REQUIRE_VISION, mSwitchVision.isChecked());
intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, mSwitchDiversity.isChecked()); intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, mSwitchDiversity.isChecked());
return intent; return intent;
} }