diff options
| author | Beverly <beverlyt@google.com> | 2021-08-06 10:32:18 -0400 |
|---|---|---|
| committer | Beverly Tai <beverlyt@google.com> | 2021-08-16 13:41:34 +0000 |
| commit | d704706f28107437f178c6a3f9f03d20ece3ef3a (patch) | |
| tree | e9ec90209e2c7beb6fa1fefa47d1c68c48ddac5c | |
| parent | e8310817afcbdec92f687cc3dfd03563ae8dc4db (diff) | |
| download | base-d704706f28107437f178c6a3f9f03d20ece3ef3a.tar.gz | |
Use layout parameters to determine lock icon location
So we don't rely on the coordinates coming from centering the view
(using gravity).
Test: manual
Fixes: 196280198
Change-Id: Iee7a7e5732d27a782d51e39e4d52b3601814bec3
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/LockIconView.java | 14 |
2 files changed, 7 insertions, 10 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index b0f1f487b260..9df7028c625e 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -54,8 +54,7 @@ <com.android.keyguard.LockIconView android:id="@+id/lock_icon_view" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center"> + android:layout_height="wrap_content"> <!-- Background protection --> <ImageView android:id="@+id/lock_icon_bg" diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconView.java b/packages/SystemUI/src/com/android/keyguard/LockIconView.java index 622419a86bfc..edb05691b530 100644 --- a/packages/SystemUI/src/com/android/keyguard/LockIconView.java +++ b/packages/SystemUI/src/com/android/keyguard/LockIconView.java @@ -22,7 +22,6 @@ import android.graphics.PointF; import android.graphics.RectF; import android.graphics.drawable.Drawable; import android.util.AttributeSet; -import android.view.Gravity; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; @@ -91,13 +90,11 @@ public class LockIconView extends FrameLayout implements Dumpable { mLockIconCenter.x + mRadius, mLockIconCenter.y + mRadius); - setX(mSensorRect.left); - setY(mSensorRect.top); - - final FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams( - (int) (mSensorRect.right - mSensorRect.left), - (int) (mSensorRect.bottom - mSensorRect.top)); - lp.gravity = Gravity.CENTER; + final FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams(); + lp.width = (int) (mSensorRect.right - mSensorRect.left); + lp.height = (int) (mSensorRect.bottom - mSensorRect.top); + lp.topMargin = (int) mSensorRect.top; + lp.setMarginStart((int) mSensorRect.left); setLayoutParams(lp); } @@ -114,5 +111,6 @@ public class LockIconView extends FrameLayout implements Dumpable { public void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) { pw.println("Center in px (x, y)= (" + mLockIconCenter.x + ", " + mLockIconCenter.y + ")"); pw.println("Radius in pixels: " + mRadius); + pw.println("topLeft= (" + getX() + ", " + getY() + ")"); } } |