Merge SP1A.210407.002

Change-Id: Iaad2b7cc2aeba166f003d0d460bc8ce29d1caab3

1 files changed, 14 insertions, 3 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
index 708b2d55b75a..7ed63375a334 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -267,6 +267,13 @@ public class KeyguardSecurityContainer extends FrameLayout {
         updateSecurityViewLocation(false);
     }
 
+    /** Update keyguard position based on a tapped X coordinate. */
+    public void updateKeyguardPosition(float x) {
+        if (mOneHandedMode) {
+            moveBouncerForXCoordinate(x, /* animate= */false);
+        }
+    }
+
     /** Return whether the one-handed keyguard should be enabled. */
     private boolean canUseOneHandedBouncer() {
         // Is it enabled?
@@ -488,9 +495,13 @@ public class KeyguardSecurityContainer extends FrameLayout {
             return;
         }
 
+        moveBouncerForXCoordinate(event.getX(), /* animate= */true);
+    }
+
+    private void moveBouncerForXCoordinate(float x, boolean animate) {
         // Did the tap hit the "other" side of the bouncer?
-        if ((mIsSecurityViewLeftAligned && (event.getX() > getWidth() / 2f))
-                || (!mIsSecurityViewLeftAligned && (event.getX() < getWidth() / 2f))) {
+        if ((mIsSecurityViewLeftAligned && (x > getWidth() / 2f))
+                || (!mIsSecurityViewLeftAligned && (x < getWidth() / 2f))) {
             mIsSecurityViewLeftAligned = !mIsSecurityViewLeftAligned;
 
             Settings.Global.putInt(
@@ -499,7 +510,7 @@ public class KeyguardSecurityContainer extends FrameLayout {
                     mIsSecurityViewLeftAligned ? Settings.Global.ONE_HANDED_KEYGUARD_SIDE_LEFT
                             : Settings.Global.ONE_HANDED_KEYGUARD_SIDE_RIGHT);
 
-            updateSecurityViewLocation(true);
+            updateSecurityViewLocation(animate);
         }
     }