diff --git a/app/src/androidTest/java/com/forrestguice/suntimeswidget/settings/WidgetSettingsTest.java b/app/src/androidTest/java/com/forrestguice/suntimeswidget/settings/WidgetSettingsTest.java index f7288aba8..5d5ea1e46 100644 --- a/app/src/androidTest/java/com/forrestguice/suntimeswidget/settings/WidgetSettingsTest.java +++ b/app/src/androidTest/java/com/forrestguice/suntimeswidget/settings/WidgetSettingsTest.java @@ -281,7 +281,7 @@ public void test_timezoneModePref() WidgetSettings.deleteTimezoneModePref(context, appWidgetId); WidgetSettings.TimezoneMode mode0 = WidgetSettings.loadTimezoneModePref(context, appWidgetId); - assertTrue("mode should be default (CURRENT) but was " + mode0, mode0 == WidgetSettings.PREF_DEF_TIMEZONE_MODE && mode0 == WidgetSettings.TimezoneMode.CURRENT_TIMEZONE); + assertTrue("mode should be default (SOLAR) but was " + mode0, mode0 == WidgetSettings.PREF_DEF_TIMEZONE_MODE && mode0 == WidgetSettings.TimezoneMode.SOLAR_TIME); } @Test @@ -321,7 +321,7 @@ public void test_solarTimeModePref() WidgetSettings.deleteSolarTimeModePref(context, appWidgetId); WidgetSettings.SolarTimeMode mode0 = WidgetSettings.loadSolarTimeModePref(context, appWidgetId); - assertTrue("mode should be default (LOCAL_MEAN_TIME) but was " + mode0, mode0 == WidgetSettings.SolarTimeMode.APPARENT_SOLAR_TIME && mode0 == WidgetSettings.PREF_DEF_TIMEZONE_SOLARMODE); + assertTrue("mode should be default (LOCAL_MEAN_TIME) but was " + mode0, mode0 == WidgetSettings.SolarTimeMode.LOCAL_MEAN_TIME && mode0 == WidgetSettings.PREF_DEF_TIMEZONE_SOLARMODE); } /////////////////////////////////////////////////////////////////////////// diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/settings/WidgetSettings.java b/app/src/main/java/com/forrestguice/suntimeswidget/settings/WidgetSettings.java index 4ae781d74..0aa501792 100644 --- a/app/src/main/java/com/forrestguice/suntimeswidget/settings/WidgetSettings.java +++ b/app/src/main/java/com/forrestguice/suntimeswidget/settings/WidgetSettings.java @@ -190,14 +190,14 @@ public class WidgetSettings public static final boolean PREF_DEF_LOCATION_FROMAPP = false; public static final String PREF_KEY_TIMEZONE_MODE = "timezoneMode"; - public static final TimezoneMode PREF_DEF_TIMEZONE_MODE = TimezoneMode.CURRENT_TIMEZONE; + public static final TimezoneMode PREF_DEF_TIMEZONE_MODE = TimezoneMode.SOLAR_TIME; public static final String PREF_KEY_TIMEZONE_CUSTOM = "timezone"; public static final String PREF_DEF_TIMEZONE_CUSTOM = "MST"; // TODO: candidate for initDefaults? public static final String[][] PREF_DEF_TIMEZONES = new String[][] { new String[] {"", PREF_DEF_TIMEZONE_CUSTOM} }; public static final String PREF_KEY_TIMEZONE_SOLARMODE = "solarmode"; - public static final SolarTimeMode PREF_DEF_TIMEZONE_SOLARMODE = SolarTimeMode.APPARENT_SOLAR_TIME; + public static final SolarTimeMode PREF_DEF_TIMEZONE_SOLARMODE = SolarTimeMode.LOCAL_MEAN_TIME; public static final String PREF_KEY_DATE_MODE = "dateMode"; public static final DateMode PREF_DEF_DATE_MODE = DateMode.CURRENT_DATE;