Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0872e36c authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android Git Automerger
Browse files

am 1d696fa4: Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb 

* commit '1d696fa4':
  Fix Incorrect Times in TimePickerDialog
parents 25bbfda2 1d696fa4

core/java/android/app/TimePickerDialog.java

+2 −2
Original line number Diff line number Diff line
@@ -107,9 +107,9 @@ public class TimePickerDialog extends AlertDialog 
        mTimePicker = (TimePicker) view.findViewById(R.id.timePicker);



        // initialize state

        mTimePicker.setIs24HourView(mIs24HourView);

        mTimePicker.setCurrentHour(mInitialHourOfDay);

        mTimePicker.setCurrentMinute(mInitialMinute);

        mTimePicker.setIs24HourView(mIs24HourView);

        mTimePicker.setOnTimeChangedListener(this);

    }
@@ -144,8 +144,8 @@ public class TimePickerDialog extends AlertDialog 
        super.onRestoreInstanceState(savedInstanceState);

        int hour = savedInstanceState.getInt(HOUR);

        int minute = savedInstanceState.getInt(MINUTE);

        mTimePicker.setIs24HourView(savedInstanceState.getBoolean(IS_24_HOUR));

        mTimePicker.setCurrentHour(hour);

        mTimePicker.setCurrentMinute(minute);

        mTimePicker.setIs24HourView(savedInstanceState.getBoolean(IS_24_HOUR));

    }

}