merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
index 35b39bd..dbcb68e 100644
--- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
@@ -51,6 +51,7 @@
for (int appWidgetId : appWidgetIds) {
float ratio = WidgetUtils.getScaleRatio(ctxt, null, appWidgetId);
updateClock(ctxt, appWidgetManager, appWidgetId, ratio);
+
}
super.onUpdate(ctxt, appWidgetManager, appWidgetIds);
}
diff --git a/src/com/android/alarmclock/DigitalWidgetViewsFactory.java b/src/com/android/alarmclock/DigitalWidgetViewsFactory.java
index fb24d07..92d798b 100644
--- a/src/com/android/alarmclock/DigitalWidgetViewsFactory.java
+++ b/src/com/android/alarmclock/DigitalWidgetViewsFactory.java
@@ -204,7 +204,6 @@
if (mId == AppWidgetManager.INVALID_APPWIDGET_ID) {
return;
}
-
mContext = context;
String action = intent.getAction();
AppWidgetManager widgetManager = AppWidgetManager.getInstance(context);
@@ -219,6 +218,11 @@
mReloadCitiesList = true;
widgetManager.notifyAppWidgetViewDataChanged(mId, R.id.digital_appwidget_listview);
+ } else if (action.equals(Intent.ACTION_SCREEN_ON)) {
+ RemoteViews widget =
+ new RemoteViews(context.getPackageName(), R.layout.digital_appwidget);
+ refreshAlarm(context, widget);
+ widgetManager.partiallyUpdateAppWidget(mId, widget);
} else {
// For any time change or locale change, refresh all
widgetManager.notifyAppWidgetViewDataChanged(mId, R.id.digital_appwidget_listview);
