Merge "Change EXTRA_TIME_PREF_24_HOUR_FORMAT from boolean to int"

src/com/android/settings/datetime/TimeFormatPreferenceController.java

@@ -95,7 +95,10 @@ public class TimeFormatPreferenceController extends PreferenceController {
 
     private void timeUpdated(boolean is24Hour) {
         Intent timeChanged = new Intent(Intent.ACTION_TIME_CHANGED);
-        timeChanged.putExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, is24Hour);
+        int timeFormatPreference =
+                is24Hour ? Intent.EXTRA_TIME_PREF_VALUE_USE_24_HOUR
+                        : Intent.EXTRA_TIME_PREF_VALUE_USE_12_HOUR;
+        timeChanged.putExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, timeFormatPreference);
         mContext.sendBroadcast(timeChanged);
     }
 

tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java

@@ -18,6 +18,7 @@ package com.android.settings.datetime;
 
 
 import android.content.Context;
+import android.content.Intent;
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.PreferenceScreen;
@@ -25,6 +26,8 @@ import android.support.v7.preference.PreferenceScreen;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
+import java.util.List;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,6 +38,7 @@ import org.robolectric.shadows.ShadowApplication;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -45,6 +49,7 @@ public class TimeFormatPreferenceControllerTest {
     @Mock
     private UpdateTimeAndDateCallback mCallback;
 
+    private ShadowApplication mApplication;
     private Context mContext;
     private SwitchPreference mPreference;
     private TimeFormatPreferenceController mController;
@@ -52,7 +57,8 @@ public class TimeFormatPreferenceControllerTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mContext = ShadowApplication.getInstance().getApplicationContext();
+        mApplication = ShadowApplication.getInstance();
+        mContext = mApplication.getApplicationContext();
     }
 
     @Test
@@ -94,4 +100,42 @@ public class TimeFormatPreferenceControllerTest {
 
         assertThat(mPreference.isChecked()).isFalse();
     }
+
+    @Test
+    public void updatePreference_12HourSet_shouldSendIntent() {
+        mController = new TimeFormatPreferenceController(mContext, mCallback, false);
+        mPreference = new SwitchPreference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        mPreference.setChecked(false);
+
+        boolean result = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(result).isTrue();
+
+        List<Intent> intentsFired = mApplication.getBroadcastIntents();
+        assertThat(intentsFired.size()).isEqualTo(1);
+        Intent intentFired = intentsFired.get(0);
+        assertThat(intentFired.getAction()).isEqualTo(Intent.ACTION_TIME_CHANGED);
+        assertThat(intentFired.getIntExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, -1))
+                .isEqualTo(Intent.EXTRA_TIME_PREF_VALUE_USE_12_HOUR);
+    }
+
+    @Test
+    public void updatePreference_24HourSet_shouldSendIntent() {
+        mController = new TimeFormatPreferenceController(mContext, mCallback, false);
+        mPreference = new SwitchPreference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        mPreference.setChecked(true);
+
+        boolean result = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(result).isTrue();
+
+        List<Intent> intentsFired = mApplication.getBroadcastIntents();
+        assertThat(intentsFired.size()).isEqualTo(1);
+        Intent intentFired = intentsFired.get(0);
+        assertThat(intentFired.getAction()).isEqualTo(Intent.ACTION_TIME_CHANGED);
+        assertThat(intentFired.getIntExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, -1))
+                .isEqualTo(Intent.EXTRA_TIME_PREF_VALUE_USE_24_HOUR);
+    }
 }