am 0d45ace3: Use the new TextClock widget for the appwidget\'s date. (bfc863f8) · Commits · e / os / android_packages_apps_DeskClock

res/layout/digital_widget_time.xml

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -55,10 +55,12 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:gravity="center">		android:gravity="center">
	<TextView android:id="@+id/date"		<TextClock android:id="@+id/date"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:textColor="@color/clock_white"		android:textColor="@color/clock_white"
			android:format12Hour="@string/abbrev_wday_month_day_no_year"
			android:format24Hour="@string/abbrev_wday_month_day_no_year"
	style="@style/label"		style="@style/label"
	android:gravity="center"		android:gravity="center"
	/>		/>

src/com/android/alarmclock/DigitalAppWidgetProvider.java

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -42,7 +42,6 @@ import java.util.Calendar;

	public class DigitalAppWidgetProvider extends AppWidgetProvider {		public class DigitalAppWidgetProvider extends AppWidgetProvider {
	private static final String TAG = "DigitalAppWidgetProvider";		private static final String TAG = "DigitalAppWidgetProvider";
	private String mDateFormat;

	public DigitalAppWidgetProvider() {		public DigitalAppWidgetProvider() {
	}		}
	@@ -71,13 +70,9 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {

	private void updateClock(		private void updateClock(
	Context c, AppWidgetManager appWidgetManager, int appWidgetId, float ratio) {		Context c, AppWidgetManager appWidgetManager, int appWidgetId, float ratio) {
	if (mDateFormat == null) {
	mDateFormat = c.getResources().getString(R.string.abbrev_wday_month_day_no_year);
	}
	RemoteViews widget = new RemoteViews(c.getPackageName(), R.layout.digital_appwidget);		RemoteViews widget = new RemoteViews(c.getPackageName(), R.layout.digital_appwidget);
	widget.setOnClickPendingIntent(R.id.digital_appwidget,		widget.setOnClickPendingIntent(R.id.digital_appwidget,
	PendingIntent.getActivity(c, 0, new Intent(c, DeskClock.class), 0));		PendingIntent.getActivity(c, 0, new Intent(c, DeskClock.class), 0));
	updateDateRemoteView(mDateFormat, widget);
	refreshAlarm(c, widget);		refreshAlarm(c, widget);
	WidgetUtils.setClockSize(c, widget, ratio);		WidgetUtils.setClockSize(c, widget, ratio);
	final Intent intent = new Intent(c, DigitalAppWidgetService.class);		final Intent intent = new Intent(c, DigitalAppWidgetService.class);
	@@ -91,14 +86,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
	appWidgetManager.updateAppWidget(appWidgetId, widget);		appWidgetManager.updateAppWidget(appWidgetId, widget);
	}		}

	private void updateDateRemoteView(String dateFormat, RemoteViews clock) {
	Calendar cal = Calendar.getInstance();
	cal.setTimeInMillis(System.currentTimeMillis());

	CharSequence newDate = DateFormat.format(dateFormat, cal);
	clock.setTextViewText(R.id.date, newDate);
	}

	private void refreshAlarm(Context c, RemoteViews clock) {		private void refreshAlarm(Context c, RemoteViews clock) {
	String nextAlarm = Settings.System.getString(		String nextAlarm = Settings.System.getString(
	c.getContentResolver(), Settings.System.NEXT_ALARM_FORMATTED);		c.getContentResolver(), Settings.System.NEXT_ALARM_FORMATTED);

src/com/android/alarmclock/DigitalWidgetViewsFactory.java

+0 −16

Original line number	Original line	Diff line number	Diff line
	@@ -46,8 +46,6 @@ public class DigitalWidgetViewsFactory extends BroadcastReceiver implements Remo
	private Context mContext;		private Context mContext;
	private int mId = AppWidgetManager.INVALID_APPWIDGET_ID;		private int mId = AppWidgetManager.INVALID_APPWIDGET_ID;
	private RemoteWorldClockAdapter mAdapter;		private RemoteWorldClockAdapter mAdapter;
	private String mDateFormat;
	private Calendar mCalendar;
	private boolean mReloadCitiesList = true;		private boolean mReloadCitiesList = true;
	private float mFontScale = 1;		private float mFontScale = 1;

	@@ -221,14 +219,9 @@ public class DigitalWidgetViewsFactory extends BroadcastReceiver implements Remo
	widgetManager.notifyAppWidgetViewDataChanged(mId, R.id.digital_appwidget_listview);		widgetManager.notifyAppWidgetViewDataChanged(mId, R.id.digital_appwidget_listview);
	RemoteViews widget =		RemoteViews widget =
	new RemoteViews(context.getPackageName(), R.layout.digital_appwidget);		new RemoteViews(context.getPackageName(), R.layout.digital_appwidget);
	if (mDateFormat == null) {
	mDateFormat =
	context.getResources().getString(R.string.abbrev_wday_month_day_no_year);
	}
	float ratio = WidgetUtils.getScaleRatio(context, null, mId);		float ratio = WidgetUtils.getScaleRatio(context, null, mId);
	WidgetUtils.setClockSize(context, widget, ratio);		WidgetUtils.setClockSize(context, widget, ratio);
	refreshAlarm(context, widget);		refreshAlarm(context, widget);
	updateDateRemoteView(mDateFormat, widget);
	widgetManager.partiallyUpdateAppWidget(mId, widget);		widgetManager.partiallyUpdateAppWidget(mId, widget);
	}		}
	}		}
	@@ -244,14 +237,5 @@ public class DigitalWidgetViewsFactory extends BroadcastReceiver implements Remo
	widget.setViewVisibility(R.id.nextAlarm, View.GONE);		widget.setViewVisibility(R.id.nextAlarm, View.GONE);
	}		}
	}		}

	private void updateDateRemoteView(
	String dateFormat, RemoteViews clock) {
	Calendar cal = Calendar.getInstance();
	cal.setTimeInMillis(System.currentTimeMillis());

	CharSequence newDate = DateFormat.format(dateFormat, cal);
	clock.setTextViewText(R.id.date, newDate);
	}
	}		}