Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0eaedb8 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I5b5b595ebaaebebe57c4856fe6c64d5887756fe8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 11c17d6e 7d772a5c

packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ 
    <!-- Margin around the various security views -->

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

    <dimen name="widget_big_font_size">100dp</dimen>

    <dimen name="widget_label_font_size">18sp</dimen>

packages/SystemUI/src/com/android/keyguard/LockIconViewController.java

+1 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
        pw.println(" mStatusBarState: " + StatusBarState.toString(mStatusBarState));

        pw.println(" mInterpolatedDarkAmount: " + mInterpolatedDarkAmount);

        pw.println(" mSensorTouchLocation: " + mSensorTouchLocation);

        pw.println(" mDefaultPaddingPx: " + mDefaultPaddingPx);



        if (mView != null) {

            mView.dump(pw, args);