diff options
| -rw-r--r-- | packages/SystemUI/res-keyguard/font/clock.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res-keyguard/font/google_sans_clock.ttf | bin | 131700 -> 0 bytes | |||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java | 8 |
3 files changed, 5 insertions, 5 deletions
diff --git a/packages/SystemUI/res-keyguard/font/clock.xml b/packages/SystemUI/res-keyguard/font/clock.xml index 5122fe74719b..d0867e9aa546 100644 --- a/packages/SystemUI/res-keyguard/font/clock.xml +++ b/packages/SystemUI/res-keyguard/font/clock.xml @@ -23,5 +23,5 @@ ** Recommended: font with variable width to support AOD => LS animations --> <font-family xmlns:android="http://schemas.android.com/apk/res/android"> - <font android:font="@font/google_sans_clock"/> + <font android:typeface="monospace"/> </font-family>
\ No newline at end of file diff --git a/packages/SystemUI/res-keyguard/font/google_sans_clock.ttf b/packages/SystemUI/res-keyguard/font/google_sans_clock.ttf Binary files differdeleted file mode 100644 index 5e683a05088c..000000000000 --- a/packages/SystemUI/res-keyguard/font/google_sans_clock.ttf +++ /dev/null diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index 48457fd84b01..22b13fe885a5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -279,10 +279,10 @@ public class NotificationPanelViewController extends PanelViewController { private final NotificationStackScrollLayoutController mNotificationStackScrollLayoutController; private final NotificationIconAreaController mNotificationIconAreaController; - // Cap and total height of GSans Clock font. Needs to be adjusted when font for the big clock is + // Cap and total height of Roboto font. Needs to be adjusted when font for the big clock is // changed. - private static final int CAP_HEIGHT = 716; - private static final int FONT_HEIGHT = 827; + private static final int CAP_HEIGHT = 1456; + private static final int FONT_HEIGHT = 2163; /** * Maximum time before which we will expand the panel even for slow motions when getting a @@ -4982,7 +4982,7 @@ public class NotificationPanelViewController extends PanelViewController { // Update Clock Pivot mKeyguardStatusViewController.setPivotX(mView.getWidth() / 2); mKeyguardStatusViewController.setPivotY( - (FONT_HEIGHT - CAP_HEIGHT) / 1000f + (FONT_HEIGHT - CAP_HEIGHT) / 2048f * mKeyguardStatusViewController.getClockTextSize()); // Calculate quick setting heights. |