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

Merge "Don't use dp for lock icon padding" into tm-qpr-dev am: 90023480a0

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

Change-Id: I34c20b8ce9bc56aeeb236c44c28f5fb922145bd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly Tai
2023-01-26 17:19:42 +00:00
committed by Automerger Merge Worker
parent 152da6324d 90023480a0
commit 7d772a5c8d
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml
View File

@@ -25,9 +25,6 @@
<!-- Margin around the various security views --> <!-- Margin around the various security views -->
<dimen name="keyguard_security_view_top_margin">12dp</dimen> <dimen name="keyguard_security_view_top_margin">12dp</dimen>
<!-- Padding for the lock icon on the keyguard -->
<dimen name="lock_icon_padding">16dp</dimen>
<!-- Overload default clock widget parameters --> <!-- Overload default clock widget parameters -->
<dimen name="widget_big_font_size">100dp</dimen> <dimen name="widget_big_font_size">100dp</dimen>
<dimen name="widget_label_font_size">18sp</dimen> <dimen name="widget_label_font_size">18sp</dimen>

1
packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
View File

@@ -429,6 +429,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
pw.println(" mStatusBarState: " + StatusBarState.toString(mStatusBarState)); pw.println(" mStatusBarState: " + StatusBarState.toString(mStatusBarState));
pw.println(" mInterpolatedDarkAmount: " + mInterpolatedDarkAmount); pw.println(" mInterpolatedDarkAmount: " + mInterpolatedDarkAmount);
pw.println(" mSensorTouchLocation: " + mSensorTouchLocation); pw.println(" mSensorTouchLocation: " + mSensorTouchLocation);
pw.println(" mDefaultPaddingPx: " + mDefaultPaddingPx);
if (mView != null) { if (mView != null) {
mView.dump(pw, args); mView.dump(pw, args);