Using the AndroidClock font in DesktopClock (602efeb2) · Commits · e / os / android_packages_apps_DeskClock

res/layout/alarm_alert.xml

+4 −2

Original line number	Diff line number	Diff line
		@@ -52,13 +52,15 @@
		android:baselineAligned="true"
		android:gravity="center_horizontal">

		<TextView android:id="@+id/timeDisplay"
		<com.android.deskclock.AndroidClockTextView
		android:id="@+id/timeDisplay"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textSize="64sp"
		android:textColor="?android:attr/textColorPrimary"/>

		<TextView android:id="@+id/am_pm"
		<com.android.deskclock.AndroidClockTextView
		android:id="@+id/am_pm"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textStyle="bold"

res/layout/alarm_clock.xml

+4 −2

Original line number	Diff line number	Diff line
		@@ -81,14 +81,16 @@
		android:layout_height="wrap_content"
		android:baselineAligned="true">

		<TextView android:id="@+id/timeDisplay"
		<com.android.deskclock.AndroidClockTextView
		android:id="@+id/timeDisplay"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingRight="6dip"
		android:textSize="48sp"
		android:textColor="?android:attr/textColorPrimary" />

		<TextView android:id="@+id/am_pm"
		<com.android.deskclock.AndroidClockTextView
		android:id="@+id/am_pm"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceSmall"

res/layout/alarm_time.xml

+4 −2

Original line number	Diff line number	Diff line
		@@ -76,7 +76,8 @@
		android:layout_height="wrap_content"
		android:baselineAligned="true">

		<TextView android:id="@+id/timeDisplay"
		<com.android.deskclock.AndroidClockTextView
		android:id="@+id/timeDisplay"
		android:includeFontPadding="false"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		@@ -84,7 +85,8 @@
		android:textSize="28sp"
		android:textColor="?android:attr/textColorPrimary"/>

		<TextView android:id="@+id/am_pm"
		<com.android.deskclock.AndroidClockTextView
		android:id="@+id/am_pm"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceSmall"

res/layout/desk_clock_time_date.xml

+4 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,8 @@
		android:layout_marginBottom="8dip"
		>

		<TextView android:id="@+id/timeDisplay"
		<com.android.deskclock.AndroidClockTextView
		android:id="@+id/timeDisplay"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		@@ -46,7 +47,8 @@
		/>


		<TextView android:id="@+id/am_pm"
		<com.android.deskclock.AndroidClockTextView
		android:id="@+id/am_pm"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="bottom"

src/com/android/deskclock/AlarmClock.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -22,12 +22,8 @@ import android.content.Context;
		import android.content.DialogInterface;
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.content.res.Configuration;
		import android.database.Cursor;
		import android.graphics.Typeface;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.Handler;
		import android.view.ContextMenu;
		import android.view.ContextMenu.ContextMenuInfo;
		import android.view.LayoutInflater;
		@@ -39,7 +35,6 @@ import android.view.ViewGroup;
		import android.widget.AdapterView;
		import android.widget.AdapterView.AdapterContextMenuInfo;
		import android.widget.AdapterView.OnItemClickListener;
		import android.widget.Button;
		import android.widget.CheckBox;
		import android.widget.CursorAdapter;
		import android.widget.ImageButton;
		@@ -81,6 +76,7 @@ public class AlarmClock extends Activity implements OnItemClickListener {
		super(context, cursor);
		}

		@Override
		public View newView(Context context, Cursor cursor, ViewGroup parent) {
		View ret = mFactory.inflate(R.layout.alarm_time, parent, false);

		@@ -90,6 +86,7 @@ public class AlarmClock extends Activity implements OnItemClickListener {
		return ret;
		}

		@Override
		public void bindView(View view, Context context, Cursor cursor) {
		final Alarm alarm = new Alarm(cursor);

		@@ -123,7 +120,6 @@ public class AlarmClock extends Activity implements OnItemClickListener {
		c.set(Calendar.HOUR_OF_DAY, alarm.hour);
		c.set(Calendar.MINUTE, alarm.minutes);
		digitalClock.updateTime(c);
		digitalClock.setTypeface(Typeface.DEFAULT);

		// Set the repeat text or leave it blank if it does not repeat.
		TextView daysOfWeekView =
		@@ -266,7 +262,7 @@ public class AlarmClock extends Activity implements OnItemClickListener {
		// Use the current item to create a custom view for the header.
		final AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
		final Cursor c =
		(Cursor) mAlarmsList.getAdapter().getItem((int) info.position);
		(Cursor) mAlarmsList.getAdapter().getItem(info.position);
		final Alarm alarm = new Alarm(c);

		// Construct the Calendar to compute the time.