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

Merge "Renamed enableOneHandedBouncer to enableDynamicKeyguardPositioning." into sc-dev am: f24f5c508d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14340808

Change-Id: I152f908c5795a8c4a905b330cbdfccd4d8431d25
This commit is contained in:
Jamie Garside
2021-05-14 15:20:41 +00:00
committed by Automerger Merge Worker
parent c14ebdf895 f24f5c508d
commit dbc71e4e7a
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/res/res/values/config.xml
View File

@@ -4796,8 +4796,9 @@
<!-- Whether to select voice/data/sms preference without user confirmation -->
<bool name="config_voice_data_sms_auto_fallback">false</bool>
<!-- Whether to enable the one-handed keyguard on the lock screen for wide-screen devices. -->
<bool name="config_enableOneHandedKeyguard">false</bool>
<!-- Whether to enable dynamic keyguard positioning for wide screen devices (e.g. only using
half of the screen, to be accessible using only one hand). -->
<bool name="config_enableDynamicKeyguardPositioning">false</bool>
<!-- Whether to allow the caching of the SIM PIN for verification after unattended reboot -->
<bool name="config_allow_pin_storage_for_unattended_reboot">true</bool>

2
core/res/res/values/symbols.xml
View File

@@ -4260,7 +4260,7 @@
<java-symbol type="bool" name="config_voice_data_sms_auto_fallback" />
<java-symbol type="bool" name="config_enableOneHandedKeyguard" />
<java-symbol type="bool" name="config_enableDynamicKeyguardPositioning" />
<java-symbol type="attr" name="colorAccentPrimary" />
<java-symbol type="attr" name="colorAccentSecondary" />

2
packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java
View File

@@ -481,7 +481,7 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView>
if (resources.getBoolean(R.bool.can_use_one_handed_bouncer)
&& resources.getBoolean(
com.android.internal.R.bool.config_enableOneHandedKeyguard)) {
com.android.internal.R.bool.config_enableDynamicKeyguardPositioning)) {
gravity = resources.getInteger(
R.integer.keyguard_host_view_one_handed_gravity);
} else {

2
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
View File

@@ -278,7 +278,7 @@ public class KeyguardSecurityContainer extends FrameLayout {
private boolean canUseOneHandedBouncer() {
// Is it enabled?
if (!getResources().getBoolean(
com.android.internal.R.bool.config_enableOneHandedKeyguard)) {
com.android.internal.R.bool.config_enableDynamicKeyguardPositioning)) {
return false;
}

6
packages/SystemUI/tests/src/com/android/keyguard/KeyguardHostViewControllerTest.java
View File

@@ -81,7 +81,7 @@ public class KeyguardHostViewControllerTest extends SysuiTestCase {
mTestableResources.addOverride(
R.bool.can_use_one_handed_bouncer, false);
mTestableResources.addOverride(
com.android.internal.R.bool.config_enableOneHandedKeyguard, false);
com.android.internal.R.bool.config_enableDynamicKeyguardPositioning, false);
when(mKeyguardSecurityContainerControllerFactory.create(any(
KeyguardSecurityContainer.SecurityCallback.class)))
@@ -150,7 +150,7 @@ public class KeyguardHostViewControllerTest extends SysuiTestCase {
mTestableResources.addOverride(
R.bool.can_use_one_handed_bouncer, false);
mTestableResources.addOverride(
com.android.internal.R.bool.config_enableOneHandedKeyguard, false);
com.android.internal.R.bool.config_enableDynamicKeyguardPositioning, false);
mKeyguardHostViewController.init();
assertEquals(
@@ -161,7 +161,7 @@ public class KeyguardHostViewControllerTest extends SysuiTestCase {
mTestableResources.addOverride(
R.bool.can_use_one_handed_bouncer, true);
mTestableResources.addOverride(
com.android.internal.R.bool.config_enableOneHandedKeyguard, true);
com.android.internal.R.bool.config_enableDynamicKeyguardPositioning, true);
mKeyguardHostViewController.updateResources();
assertEquals(

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

@@ -246,7 +246,8 @@ public class KeyguardSecurityContainerTest extends SysuiTestCase {
boolean sysuiResourceCanUseOneHandedKeyguard,
SecurityMode securityMode) {
TestableResources testableResources = mContext.getOrCreateTestableResources();
testableResources.addOverride(com.android.internal.R.bool.config_enableOneHandedKeyguard,
testableResources.addOverride(
com.android.internal.R.bool.config_enableDynamicKeyguardPositioning,
deviceConfigCanUseOneHandedKeyguard);
testableResources.addOverride(R.bool.can_use_one_handed_bouncer,
sysuiResourceCanUseOneHandedKeyguard);