Fix issue where ConfirmLockPattern is using wrong layout
This fixes 2 bugs:
1. ConfirmLockPattern will default to thinking it should be run with
Expressive theme due to
ChooseLockSettingsHelper.EXTRA_KEY_USE_EXPRESSIVE_STYLE not getting
set in the ConfirmLockPattern intent and falling back to
`SettingsThemeHelper.isExpressiveTheme()`. This is fixed by adding
the intent extra like seen in ConfirmLockPassword.
2. The incorrect layout is selected when the theme is expressive theme
since the if/else conditional branch checks if the theme is equal to
NORMAL. NORMAL and EXPRESSIVE should be sharing the same layout.
Bug: 423044533
Bug: 422257116
Flag: EXEMPT for expressive style customization
Test: Manually started the remote LSKF validation as well as normal LSKF
confirmation. Screenshots can be found in the bug.
Test: atest ConfirmLockPasswordTest
Test: atest ConfirmLockPatternTest
Change-Id: Ic6fff1774acbca7c3bebd80325a208f71705fe45
2 files changed