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

Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ibb2a4c9f98a1c6f302288252201d12f28de4a1e1
This commit is contained in:
Curtis Belmonte
2021-08-17 01:01:47 +00:00
committed by Automerger Merge Worker
parent 4ff69294a4 2b318b3b69
commit 474fba01f1
5 changed files with 7 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -499,13 +499,7 @@ public class ChooseLockPassword extends SettingsActivity {
mNextButton = mixin.getPrimaryButton();
mMessage = view.findViewById(R.id.sud_layout_description);
if (mForFingerprint) {
mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_fingerprint_header));
} else if (mForFace) {
mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_face_header));
} else if (mForBiometrics) {
mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_lock));
}
mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_lock));
mIsAlphaMode = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == mPasswordType
|| DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == mPasswordType

8
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -505,13 +505,7 @@ public class ChooseLockPattern extends SettingsActivity {
layout.getMixin(IconMixin.class).setVisibility(View.GONE);
}
} else {
if (mForFingerprint) {
layout.setIcon(getActivity().getDrawable(R.drawable.ic_fingerprint_header));
} else if (mForFace) {
layout.setIcon(getActivity().getDrawable(R.drawable.ic_face_header));
} else if (mForBiometrics) {
layout.setIcon(getActivity().getDrawable(R.drawable.ic_lock));
}
layout.setIcon(getActivity().getDrawable(R.drawable.ic_lock));
}
final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);