diff options
4 files changed, 12 insertions, 5 deletions
diff --git a/packages/SystemUI/res/values-sw600dp/config.xml b/packages/SystemUI/res/values-sw600dp/config.xml index 36cc0ad70315..c0071cb45e21 100644 --- a/packages/SystemUI/res/values-sw600dp/config.xml +++ b/packages/SystemUI/res/values-sw600dp/config.xml @@ -40,4 +40,6 @@ <bool name="config_use_large_screen_shade_header">true</bool> + <!-- Whether to show the side fps hint while on bouncer --> + <bool name="config_show_sidefps_hint_on_bouncer">true</bool> </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 82a3b58a5155..ec22c609b0b9 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -548,6 +548,9 @@ <!-- Package name of the preferred system app to perform eSOS action --> <string name="config_preferredEmergencySosPackage" translatable="false"></string> + <!-- Whether to show the side fps hint while on bouncer --> + <bool name="config_show_sidefps_hint_on_bouncer">false</bool> + <!-- Whether to use the split 2-column notification shade --> <bool name="config_use_split_notification_shade">false</bool> diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java index 5ee659be6dd2..0b3fe46007e5 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java @@ -343,7 +343,8 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard if (!mSidefpsController.isPresent()) { return; } - if (mBouncerVisible && mView.isSidedSecurityMode() + if (mBouncerVisible + && getResources().getBoolean(R.bool.config_show_sidefps_hint_on_bouncer) && mUpdateMonitor.isFingerprintDetectionRunning() && !mUpdateMonitor.userNeedsStrongAuth()) { mSidefpsController.get().show(); diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java index 68e49c0a1d4b..dc87a6a45131 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java @@ -318,7 +318,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { @Test public void onBouncerVisibilityChanged_withoutSidedSecurity_sideFpsHintHidden() { setupConditionsToEnableSideFpsHint(); - setSidedSecurityMode(false); + setSideFpsHintEnabledFromResources(false); reset(mSidefpsController); mKeyguardSecurityContainerController.onBouncerVisibilityChanged(View.VISIBLE); @@ -383,7 +383,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { private void setupConditionsToEnableSideFpsHint() { attachView(); - setSidedSecurityMode(true); + setSideFpsHintEnabledFromResources(true); setFingerprintDetectionRunning(true); setNeedsStrongAuth(false); } @@ -399,8 +399,9 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { BiometricSourceType.FINGERPRINT); } - private void setSidedSecurityMode(boolean sided) { - when(mView.isSidedSecurityMode()).thenReturn(sided); + private void setSideFpsHintEnabledFromResources(boolean enabled) { + when(mResources.getBoolean(R.bool.config_show_sidefps_hint_on_bouncer)).thenReturn( + enabled); } private void setNeedsStrongAuth(boolean needed) { |