Fix some bugs from gb merges for tz

Not everything needed was merged through. This fixes the bugs
caused by that. After this change a non-functional option to set
a home time zone will be in master.

Change-Id: Ie180d93cb77e576840a6349aa1d8908ddaf12fa9

1 files changed, 8 insertions, 6 deletions

diff --git a/src/com/android/calendar/Utils.java b/src/com/android/calendar/Utils.java
index c6ea6d3d..1d80565e 100644
--- a/src/com/android/calendar/Utils.java
+++ b/src/com/android/calendar/Utils.java
@@ -120,22 +120,24 @@ public class Utils {
             }
             return;
         }
+        boolean updatePrefs = false;
         synchronized (mTZCallbacks) {
             if (CalendarPreferenceActivity.LOCAL_TZ.equals(timeZone)) {
-                if (!mUseHomeTZ) {
-                    return;
+                if (mUseHomeTZ) {
+                    updatePrefs = true;
                 }
                 mUseHomeTZ = false;
             } else {
-                if (TextUtils.equals(mHomeTZ, timeZone)) {
-                    return;
+                if (!mUseHomeTZ || !TextUtils.equals(mHomeTZ, timeZone)) {
+                    updatePrefs = true;
                 }
                 mUseHomeTZ = true;
                 mHomeTZ = timeZone;
             }
         }
-        setSharedPreference(context, CalendarPreferenceActivity.KEY_HOME_TZ_ENABLED, mUseHomeTZ);
-        if (mUseHomeTZ) {
+        if (updatePrefs) {
+            setSharedPreference(context, CalendarPreferenceActivity.KEY_HOME_TZ_ENABLED,
+                    mUseHomeTZ);
             setSharedPreference(context, CalendarPreferenceActivity.KEY_HOME_TZ, mHomeTZ);
         }
         // TODO async update db