Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix sidefps on portrait large screens" into tm-qpr-dev

Browse Source
This commit is contained in:
Nicolò Mazzucato
2022-08-02 14:32:14 +00:00
committed by Android (Google) Code Review
parent fb50080c39 ac82db46c6
commit 25ab210588
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values-sw600dp/config.xml
View File

@@ -40,4 +40,6 @@
<bool name="config_use_large_screen_shade_header">true</bool> <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> </resources>

3
packages/SystemUI/res/values/config.xml
View File

@@ -548,6 +548,9 @@
<!-- Package name of the preferred system app to perform eSOS action --> <!-- Package name of the preferred system app to perform eSOS action -->
<string name="config_preferredEmergencySosPackage" translatable="false"></string> <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 --> <!-- Whether to use the split 2-column notification shade -->
<bool name="config_use_split_notification_shade">false</bool> <bool name="config_use_split_notification_shade">false</bool>

3
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
View File

@@ -343,7 +343,8 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
if (!mSidefpsController.isPresent()) { if (!mSidefpsController.isPresent()) {
return; return;
} }
if (mBouncerVisible && mView.isSidedSecurityMode() if (mBouncerVisible
&& getResources().getBoolean(R.bool.config_show_sidefps_hint_on_bouncer)
&& mUpdateMonitor.isFingerprintDetectionRunning() && mUpdateMonitor.isFingerprintDetectionRunning()
&& !mUpdateMonitor.userNeedsStrongAuth()) { && !mUpdateMonitor.userNeedsStrongAuth()) {
mSidefpsController.get().show(); mSidefpsController.get().show();

9
packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java
View File

@@ -318,7 +318,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {
@Test @Test
public void onBouncerVisibilityChanged_withoutSidedSecurity_sideFpsHintHidden() { public void onBouncerVisibilityChanged_withoutSidedSecurity_sideFpsHintHidden() {
setupConditionsToEnableSideFpsHint(); setupConditionsToEnableSideFpsHint();
setSidedSecurityMode(false); setSideFpsHintEnabledFromResources(false);
reset(mSidefpsController); reset(mSidefpsController);
mKeyguardSecurityContainerController.onBouncerVisibilityChanged(View.VISIBLE); mKeyguardSecurityContainerController.onBouncerVisibilityChanged(View.VISIBLE);
@@ -383,7 +383,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {
private void setupConditionsToEnableSideFpsHint() { private void setupConditionsToEnableSideFpsHint() {
attachView(); attachView();
setSidedSecurityMode(true); setSideFpsHintEnabledFromResources(true);
setFingerprintDetectionRunning(true); setFingerprintDetectionRunning(true);
setNeedsStrongAuth(false); setNeedsStrongAuth(false);
} }
@@ -399,8 +399,9 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {
BiometricSourceType.FINGERPRINT); BiometricSourceType.FINGERPRINT);
} }
private void setSidedSecurityMode(boolean sided) { private void setSideFpsHintEnabledFromResources(boolean enabled) {
when(mView.isSidedSecurityMode()).thenReturn(sided); when(mResources.getBoolean(R.bool.config_show_sidefps_hint_on_bouncer)).thenReturn(
enabled);
} }
private void setNeedsStrongAuth(boolean needed) { private void setNeedsStrongAuth(boolean needed) {