Merge "Fix 3148496: Update LockScreen clock to use new font." (ae115191) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/DigitalClock.java

+17 −6

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.res.AssetManager;
		import android.content.res.Resources;
		import android.database.ContentObserver;
		import android.graphics.Typeface;
		@@ -41,12 +42,16 @@ import java.util.Calendar;
		*/
		public class DigitalClock extends RelativeLayout {

		private static final String SYSTEM = "/system/fonts/";
		private static final String SYSTEM_FONT_TIME_BACKGROUND = SYSTEM + "AndroidClock.ttf";
		private static final String SYSTEM_FONT_TIME_FOREGROUND = SYSTEM + "AndroidClock_Highlight.ttf";
		private final static String M12 = "h:mm";
		private final static String M24 = "kk:mm";

		private Calendar mCalendar;
		private String mFormat;
		private TextView mTimeDisplay;
		private TextView mTimeDisplayBackground;
		private TextView mTimeDisplayForeground;
		private AmPm mAmPm;
		private ContentObserver mFormatChangeObserver;
		private boolean mLive = true;
		@@ -117,9 +122,14 @@ public class DigitalClock extends RelativeLayout {
		protected void onFinishInflate() {
		super.onFinishInflate();

		mTimeDisplay = (TextView) findViewById(R.id.timeDisplay);
		mTimeDisplay.setTypeface(Typeface.createFromFile("/system/fonts/Clockopia.ttf"));
		mAmPm = new AmPm(this, Typeface.createFromFile("/system/fonts/DroidSans-Bold.ttf"));
		AssetManager assets = mContext.getAssets();

		/* The time display consists of two tones. That's why we have two overlapping text views. */
		mTimeDisplayBackground = (TextView) findViewById(R.id.timeDisplayBackground);
		mTimeDisplayBackground.setTypeface(Typeface.createFromFile(SYSTEM_FONT_TIME_BACKGROUND));
		mTimeDisplayForeground = (TextView) findViewById(R.id.timeDisplayForeground);
		mTimeDisplayForeground.setTypeface(Typeface.createFromFile(SYSTEM_FONT_TIME_FOREGROUND));
		mAmPm = new AmPm(this, Typeface.createFromFile(SYSTEM_FONT_TIME_BACKGROUND));
		mCalendar = Calendar.getInstance();

		setDateFormat();
		@@ -175,7 +185,8 @@ public class DigitalClock extends RelativeLayout {
		}

		CharSequence newTime = DateFormat.format(mFormat, mCalendar);
		mTimeDisplay.setText(newTime);
		mTimeDisplayBackground.setText(newTime);
		mTimeDisplayForeground.setText(newTime);
		mAmPm.setIsMorning(mCalendar.get(Calendar.AM_PM) == 0);
		}

core/res/res/layout-xlarge/keyguard_screen_status_land.xml

+31 −21

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@
		android:layout_marginTop="32dip"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:visibility="gone"
		/>

		<com.android.internal.widget.DigitalClock android:id="@+id/time"
		@@ -47,37 +48,45 @@
		android:layout_alignParentLeft="true"
		android:layout_marginTop="8dip"
		android:layout_marginBottom="8dip"
		android:layout_marginLeft="-10dip"
		>

		<TextView android:id="@+id/timeDisplay"
		<!-- Because we can't have multi-tone fonts, we render two TextViews, one on
		top of the other. Hence the redundant layout... -->
		<TextView android:id="@+id/timeDisplayBackground"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="120sp"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:shadowColor="#C0000000"
		android:shadowDx="0"
		android:shadowDy="0"
		android:shadowRadius="3.0"
		android:textColor="#999999"
		android:layout_marginBottom="6dip"
		/>

		<TextView android:id="@+id/timeDisplayForeground"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="120sp"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textColor="#666666"
		android:layout_alignLeft="@id/timeDisplayBackground"
		android:layout_alignTop="@id/timeDisplayBackground"
		android:layout_marginBottom="6dip"
		/>

		<TextView android:id="@+id/am_pm"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_toRightOf="@id/timeDisplay"
		android:layout_alignBaseline="@id/timeDisplay"
		android:layout_toRightOf="@id/timeDisplayBackground"
		android:layout_alignBaseline="@id/timeDisplayBackground"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="30sp"
		android:layout_marginLeft="8dip"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:shadowColor="#C0000000"
		android:shadowDx="0"
		android:shadowDy="0"
		android:shadowRadius="3.0"
		/>

		</com.android.internal.widget.DigitalClock>
		@@ -87,29 +96,30 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@id/time"
		android:layout_marginTop="5dip"
		android:layout_marginTop="10dip"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="32sp"
		android:textSize="22sp"
		/>

		<!-- used for instructions such as "draw pattern to unlock", the next alarm, and charging
		status. -->
		<!-- Status2 is generally charge status -->
		<TextView
		android:id="@+id/status2"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="32sp"
		android:layout_marginTop="50dip"
		android:textSize="22sp"
		android:layout_marginTop="10dip"
		android:drawablePadding="4dip"
		/>

		<!-- Status1 is generally alarm status -->
		<TextView
		android:id="@+id/status1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="15dip"
		android:textSize="32sp"
		android:layout_marginTop="10dip"
		android:textSize="22sp"
		android:textAppearance="?android:attr/textAppearanceMedium"
		/>

		@@ -120,7 +130,7 @@
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="22sp"
		android:layout_marginTop="50dip"
		android:layout_marginTop="20dip"
		android:singleLine="false"
		android:visibility="invisible"
		/>

core/res/res/layout-xlarge/keyguard_screen_status_port.xml

+30 −22

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@
		android:layout_marginTop="32dip"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:visibility="gone"
		/>

		<com.android.internal.widget.DigitalClock android:id="@+id/time"
		@@ -47,37 +48,44 @@
		android:layout_alignParentLeft="true"
		android:layout_marginTop="8dip"
		android:layout_marginBottom="8dip"
		>
		android_layout_marginLeft="-10dip">

		<TextView android:id="@+id/timeDisplay"
		<!-- Because we can't have multi-tone fonts, we render two TextViews, one on
		top of the other. Hence the redundant layout... -->
		<TextView android:id="@+id/timeDisplayBackground"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="120sp"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:shadowColor="#C0000000"
		android:shadowDx="0"
		android:shadowDy="0"
		android:shadowRadius="3.0"
		android:textColor="#999999"
		android:layout_marginBottom="6dip"
		/>

		<TextView android:id="@+id/timeDisplayForeground"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="120sp"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textColor="#666666"
		android:layout_marginBottom="6dip"
		android:layout_alignLeft="@id/timeDisplayBackground"
		android:layout_alignTop="@id/timeDisplayBackground"
		/>

		<TextView android:id="@+id/am_pm"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_toRightOf="@id/timeDisplay"
		android:layout_alignBaseline="@id/timeDisplay"
		android:layout_toRightOf="@id/timeDisplayBackground"
		android:layout_alignBaseline="@id/timeDisplayBackground"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="30sp"
		android:layout_marginLeft="8dip"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:shadowColor="#C0000000"
		android:shadowDx="0"
		android:shadowDy="0"
		android:shadowRadius="3.0"
		/>

		</com.android.internal.widget.DigitalClock>
		@@ -87,29 +95,29 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@id/time"
		android:layout_marginTop="5dip"
		android:layout_marginTop="10dip"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="32sp"
		android:textSize="22sp"
		/>

		<!-- used for instructions such as "draw pattern to unlock", the next alarm, and charging
		status. -->
		<!-- used for status such as the next alarm, and charging status. -->
		<TextView
		android:id="@+id/status2"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="32sp"
		android:layout_marginTop="50dip"
		android:textSize="22sp"
		android:layout_marginTop="10dip"
		android:drawablePadding="4dip"
		/>

		<TextView
		android:id="@+id/status1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="15dip"
		android:textSize="32sp"
		android:layout_marginTop="10dip"
		android:textSize="22sp"
		android:textAppearance="?android:attr/textAppearanceMedium"
		/>

		@@ -118,9 +126,9 @@
		android:lineSpacingExtra="8dip"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="20dip"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="22sp"
		android:layout_marginTop="50dip"
		android:singleLine="false"
		android:visibility="invisible"
		/>

core/res/res/layout/keyguard_screen_tab_unlock.xml

+19 −12

Original line number	Diff line number	Diff line
		@@ -67,35 +67,42 @@
		android:layout_marginBottom="8dip"
		>

		<TextView android:id="@+id/timeDisplay"
		<!-- Because we can't have multi-tone fonts, we render two TextViews, one on
		top of the other. Hence the redundant layout... -->
		<TextView android:id="@+id/timeDisplayBackground"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="72sp"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:shadowColor="#C0000000"
		android:shadowDx="0"
		android:shadowDy="0"
		android:shadowRadius="3.0"
		android:layout_marginBottom="10dip"
		android:layout_marginBottom="6dip"
		android:textColor="#999999"
		/>

		<TextView android:id="@+id/timeDisplayForeground"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="72sp"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:layout_marginBottom="6dip"
		android:textColor="#666666"
		android:layout_alignLeft="@id/timeDisplayBackground"
		android:layout_alignTop="@id/timeDisplayBackground"
		/>

		<TextView android:id="@+id/am_pm"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_toRightOf="@id/timeDisplay"
		android:layout_alignBaseline="@id/timeDisplay"
		android:layout_toRightOf="@id/timeDisplayBackground"
		android:layout_alignBaseline="@id/timeDisplayBackground"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="22sp"
		android:layout_marginLeft="8dip"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:shadowColor="#C0000000"
		android:shadowDx="0"
		android:shadowDy="0"
		android:shadowRadius="3.0"
		/>

		</com.android.internal.widget.DigitalClock>

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+18 −11

Original line number	Diff line number	Diff line
		@@ -68,35 +68,42 @@
		android:layout_marginBottom="8dip"
		>

		<TextView android:id="@+id/timeDisplay"
		<!-- Because we can't have multi-tone fonts, we render two TextViews, one on
		top of the other. Hence the redundant layout... -->
		<TextView android:id="@+id/timeDisplayBackground"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="72sp"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:shadowColor="#C0000000"
		android:shadowDx="0"
		android:shadowDy="0"
		android:shadowRadius="3.0"
		android:layout_marginBottom="6dip"
		android:textColor="#999999"
		/>

		<TextView android:id="@+id/timeDisplayForeground"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="72sp"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:layout_marginBottom="6dip"
		android:textColor="#666666"
		android:layout_alignLeft="@id/timeDisplayBackground"
		android:layout_alignTop="@id/timeDisplayBackground"
		/>

		<TextView android:id="@+id/am_pm"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_toRightOf="@id/timeDisplay"
		android:layout_alignBaseline="@id/timeDisplay"
		android:layout_toRightOf="@id/timeDisplayBackground"
		android:layout_alignBaseline="@id/timeDisplayBackground"
		android:singleLine="true"
		android:ellipsize="none"
		android:textSize="22sp"
		android:layout_marginLeft="8dip"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:shadowColor="#C0000000"
		android:shadowDx="0"
		android:shadowDy="0"
		android:shadowRadius="3.0"
		/>

		</com.android.internal.widget.DigitalClock>