1 files changed, 9 insertions, 23 deletions

diff --git a/core/java/android/app/TimePickerDialog.java b/core/java/android/app/TimePickerDialog.java
index 381143c..26af4eb 100644
--- a/core/java/android/app/TimePickerDialog.java
+++ b/core/java/android/app/TimePickerDialog.java
@@ -16,29 +16,26 @@
 
 package android.app;
 
+import com.android.internal.R;
+
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Build;
 import android.os.Bundle;
-import android.text.format.DateFormat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TimePicker;
 import android.widget.TimePicker.OnTimeChangedListener;
 
-import com.android.internal.R;
-
-import java.util.Calendar;
-
 /**
  * A dialog that prompts the user for the time of day using a {@link TimePicker}.
  *
  * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-timepicker.html">Time Picker
  * tutorial</a>.</p>
  */
-public class TimePickerDialog extends AlertDialog implements OnClickListener,
-        OnTimeChangedListener {
+public class TimePickerDialog extends AlertDialog
+        implements OnClickListener, OnTimeChangedListener {
 
     /**
      * The callback interface used to indicate the user is done filling in
@@ -60,8 +57,6 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
 
     private final TimePicker mTimePicker;
     private final OnTimeSetListener mCallback;
-    private final Calendar mCalendar;
-    private final java.text.DateFormat mDateFormat;
 
     int mInitialHourOfDay;
     int mInitialMinute;
@@ -102,14 +97,13 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
         mInitialMinute = minute;
         mIs24HourView = is24HourView;
 
-        mDateFormat = DateFormat.getTimeFormat(context);
-        mCalendar = Calendar.getInstance();
-        updateTitle(mInitialHourOfDay, mInitialMinute);
+        setCanceledOnTouchOutside(false);
+        setIcon(0);
+        setTitle(R.string.time_picker_dialog_title);
 
         setButton(BUTTON_POSITIVE, context.getText(R.string.date_time_set), this);
         setButton(BUTTON_NEGATIVE, context.getText(R.string.cancel),
                 (OnClickListener) null);
-        setIcon(R.drawable.ic_dialog_time);
 
         LayoutInflater inflater =
                 (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -132,19 +126,13 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
         }
     }
 
-    public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {
-        updateTitle(hourOfDay, minute);
-    }
-
     public void updateTime(int hourOfDay, int minutOfHour) {
         mTimePicker.setCurrentHour(hourOfDay);
         mTimePicker.setCurrentMinute(minutOfHour);
     }
 
-    private void updateTitle(int hour, int minute) {
-        mCalendar.set(Calendar.HOUR_OF_DAY, hour);
-        mCalendar.set(Calendar.MINUTE, minute);
-        setTitle(mDateFormat.format(mCalendar.getTime()));
+    public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {
+        /* do nothing */
     }
 
     @Override
@@ -164,7 +152,5 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
         mTimePicker.setCurrentHour(hour);
         mTimePicker.setCurrentMinute(minute);
         mTimePicker.setIs24HourView(savedInstanceState.getBoolean(IS_24_HOUR));
-        mTimePicker.setOnTimeChangedListener(this);
-        updateTitle(hour, minute);
     }
 }