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

Commit 593b3d34 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 0a18ac12: am 0d5cad73: Merge "Updating AndroidClock font to match the... 

am 0a18ac12: am 0d5cad73: Merge "Updating AndroidClock font to match the Roboto thin style for time display." into jb-mr1-dev

* commit '0a18ac12':
  Updating AndroidClock font to match the Roboto thin style for time display.
parents 26af98cb 0a18ac12

data/fonts/AndroidClock.ttf

+292 B (5 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

policy/src/com/android/internal/policy/impl/keyguard/ClockView.java

+2 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.internal.R; 
 * Displays the time

 */

public class ClockView extends RelativeLayout {

    private static final String ANDROID_CLOCK_FONT_FILE = "/system/fonts/AndroidClock.ttf";

    private final static String M12 = "h:mm";

    private final static String M24 = "kk:mm";
@@ -153,7 +154,7 @@ public class ClockView extends RelativeLayout { 
    protected void onFinishInflate() {

        super.onFinishInflate();

        mTimeView = (TextView) findViewById(R.id.clock_text);

        mTimeView.setTypeface(Typeface.create("sans-serif-thin", Typeface.NORMAL));

        mTimeView.setTypeface(Typeface.createFromFile(ANDROID_CLOCK_FONT_FILE));

        mAmPm = new AmPm(this, null);

        mCalendar = Calendar.getInstance();

        setDateFormat();