Merge tag 'LA.UM.5.5.r1-00900-8x96.0' of git://codeaurora.org/platform/packages/apps/DeskClock into cm-14.0cm-14.0

"LA.UM.5.5.r1-00900-8x96.0"

2 files changed, 30 insertions, 1 deletions

diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java
index c9b339fb9..13740f20b 100644
--- a/src/com/android/deskclock/ClockFragment.java
+++ b/src/com/android/deskclock/ClockFragment.java
@@ -74,6 +74,7 @@ public final class ClockFragment extends DeskClockFragment {
     private ListView mCityList;
     private String mDateFormat;
     private String mDateFormatForAccessibility;
+    private BroadcastReceiver mCitesChangedReceiver;
 
     /** The public no-arg constructor required by all fragments. */
     public ClockFragment() {}
@@ -119,6 +120,18 @@ public final class ClockFragment extends DeskClockFragment {
 
         mDigitalClock = (TextClock) mClockFrame.findViewById(R.id.digital_clock);
         mAnalogClock = mClockFrame.findViewById(R.id.analog_clock);
+
+        final IntentFilter filter = new IntentFilter();
+        filter.addAction(DataModel.ACTION_DIGITAL_WIDGET_CHANGED);
+        getActivity().registerReceiver(mCitesChangedReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (mCityAdapter != null) {
+                    mCityAdapter.notifyDataSetChanged();
+                }
+            }
+        }, filter);
+
         return fragmentView;
     }
 
@@ -181,6 +194,17 @@ public final class ClockFragment extends DeskClockFragment {
     }
 
     @Override
+    public void onDestroyView() {
+
+        if (mCitesChangedReceiver != null) {
+            getActivity().unregisterReceiver(mCitesChangedReceiver);
+            mCitesChangedReceiver = null;
+        }
+
+        super.onDestroyView();
+    }
+
+    @Override
     public void onFabClick(View view) {
         startActivity(new Intent(getActivity(), CitySelectionActivity.class));
     }
@@ -227,6 +251,11 @@ public final class ClockFragment extends DeskClockFragment {
      */
     private void refreshAlarm() {
         Utils.refreshAlarm(getActivity(), mClockFrame);
+
+        // Refresh the next alarm in header view
+        if (mCityAdapter != null) {
+            mCityAdapter.notifyDataSetChanged();
+        }
     }
 
     /**
diff --git a/src/com/android/deskclock/alarms/AlarmStateManager.java b/src/com/android/deskclock/alarms/AlarmStateManager.java
index 98194b274..dc1cec6e7 100755
--- a/src/com/android/deskclock/alarms/AlarmStateManager.java
+++ b/src/com/android/deskclock/alarms/AlarmStateManager.java
@@ -771,7 +771,7 @@ public final class AlarmStateManager extends BroadcastReceiver {
             alarmBuffer.add(Calendar.SECOND, ALARM_FIRE_BUFFER);
             if (currentTime.before(alarmBuffer)) {
                 setFiredState(context, instance);
-            } else if (!isAlarmBoot()) {
+            } else {
                 setMissedState(context, instance);
             }
         } else if (instance.mAlarmState == AlarmInstance.SNOOZE_STATE) {