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

Commit 2c527ba5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Centering big clock vertically on large screen lockscreen and AOD" into... 

Merge "Centering big clock vertically on large screen lockscreen and AOD" into sc-v2-dev am: 03f25fd4

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

Change-Id: I3b9f3ed256ac865e0e3eadd641271e345a512145
parents f53a2e9c 03f25fd4

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

+6 −8
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private final KeyguardBypassController mBypassController;



    private int mLargeClockTopMargin = 0;

    private int mKeyguardClockTopMargin = 0;



    /**
@@ -276,16 +275,15 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
    }



    private void updateClockLayout() {

        int largeClockTopMargin = 0;

        if (mSmartspaceController.isEnabled()) {

            largeClockTopMargin = getContext().getResources().getDimensionPixelSize(

                    R.dimen.keyguard_large_clock_top_margin);

        }

        RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT,

                MATCH_PARENT);

            mLargeClockTopMargin = getContext().getResources().getDimensionPixelSize(

                    R.dimen.keyguard_large_clock_top_margin);

            lp.topMargin = mLargeClockTopMargin;

        lp.topMargin = largeClockTopMargin;

        mLargeClockFrame.setLayoutParams(lp);

        } else {

            mLargeClockTopMargin = 0;

        }

    }



    /**