diff options
6 files changed, 11 insertions, 9 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index fbc96783597d..be7f38970006 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4758,8 +4758,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> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 0421f2c5d471..9bb78d912fdd 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4245,7 +4245,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" /> diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java index d06c8bc6bffe..3ebd652b3467 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java @@ -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 { diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java index 54ecf955ed11..ca4d73b6de5d 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -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; } diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardHostViewControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardHostViewControllerTest.java index 42314bf3643f..6f2c56515767 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardHostViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardHostViewControllerTest.java @@ -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( diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java index 9557d5cdb982..f5916e748f04 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java @@ -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); |