diff options
| author | Michael Chan <mchan@android.com> | 2013-04-12 21:12:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-12 21:12:41 +0000 |
| commit | 46589e2404672c0f6a065d0dd29a9d6430e8c540 (patch) | |
| tree | dad148b60d7c4cc9160131eb8c67b41f28419fed /src/com/android | |
| parent | 68cf75c58ecc3fbf3a24189443490608efcc9caf (diff) | |
| parent | 95d901f5c1b1dafc8b724e8bf4f9ac14af80862f (diff) | |
| download | android_frameworks_opt_timezonepicker-46589e2404672c0f6a065d0dd29a9d6430e8c540.tar.gz android_frameworks_opt_timezonepicker-46589e2404672c0f6a065d0dd29a9d6430e8c540.tar.bz2 android_frameworks_opt_timezonepicker-46589e2404672c0f6a065d0dd29a9d6430e8c540.zip | |
Merge "Read the "current" time zone from getArg." into jb-mr2-dev
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/timezonepicker/TimeZonePickerDialog.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/com/android/timezonepicker/TimeZonePickerDialog.java b/src/com/android/timezonepicker/TimeZonePickerDialog.java index fca2bbc..4977be3 100644 --- a/src/com/android/timezonepicker/TimeZonePickerDialog.java +++ b/src/com/android/timezonepicker/TimeZonePickerDialog.java @@ -49,12 +49,10 @@ public class TimeZonePickerDialog extends DialogFragment implements Bundle savedInstanceState) { long timeMillis = 0; String timeZone = null; - if (savedInstanceState == null) { - Bundle b = getArguments(); - if (b != null) { - timeMillis = b.getLong(BUNDLE_START_TIME_MILLIS); - timeZone = b.getString(BUNDLE_TIME_ZONE); - } + Bundle b = getArguments(); + if (b != null) { + timeMillis = b.getLong(BUNDLE_START_TIME_MILLIS); + timeZone = b.getString(BUNDLE_TIME_ZONE); } return new TimeZonePickerView(getActivity(), null, timeZone, timeMillis, this); } |