Merge "Renamed enableOneHandedBouncer to enableDynamicKeyguardPositioning." into sc-dev

core/res/res/values/config.xml

@@ -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. -->
+    <!-- Whether to enable dynamic keyguard positioning for wide screen devices (e.g. only using
-    <bool name="config_enableOneHandedKeyguard">false</bool>
+         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>

core/res/res/values/symbols.xml

@@ -4259,7 +4259,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" />

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 {

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;
         }
 

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(

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);