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

Merge "Use layout parameters to determine lock icon location" into sc-dev am: d20a486dce

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

Change-Id: I3df3fbd154992579edcc000b89b7afc1e8be45cc
This commit is contained in:
Beverly Tai
2021-08-16 21:49:22 +00:00
committed by Automerger Merge Worker
parent 3e7384fbe2 d20a486dce
commit 51e68e2a08
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/status_bar_expanded.xml
View File

@@ -54,8 +54,7 @@
<com.android.keyguard.LockIconView <com.android.keyguard.LockIconView
android:id="@+id/lock_icon_view" android:id="@+id/lock_icon_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_gravity="center">
<!-- Background protection --> <!-- Background protection -->
<ImageView <ImageView
android:id="@+id/lock_icon_bg" android:id="@+id/lock_icon_bg"

14
packages/SystemUI/src/com/android/keyguard/LockIconView.java
View File

@@ -22,7 +22,6 @@ import android.graphics.PointF;
import android.graphics.RectF; import android.graphics.RectF;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View; import android.view.View;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
@@ -91,13 +90,11 @@ public class LockIconView extends FrameLayout implements Dumpable {
mLockIconCenter.x + mRadius, mLockIconCenter.x + mRadius,
mLockIconCenter.y + mRadius); mLockIconCenter.y + mRadius);
setX(mSensorRect.left); final FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams();
setY(mSensorRect.top); lp.width = (int) (mSensorRect.right - mSensorRect.left);
lp.height = (int) (mSensorRect.bottom - mSensorRect.top);
final FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams( lp.topMargin = (int) mSensorRect.top;
(int) (mSensorRect.right - mSensorRect.left), lp.setMarginStart((int) mSensorRect.left);
(int) (mSensorRect.bottom - mSensorRect.top));
lp.gravity = Gravity.CENTER;
setLayoutParams(lp); 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) { 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("Center in px (x, y)= (" + mLockIconCenter.x + ", " + mLockIconCenter.y + ")");
pw.println("Radius in pixels: " + mRadius); pw.println("Radius in pixels: " + mRadius);
pw.println("topLeft= (" + getX() + ", " + getY() + ")");
} }
} }