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

Commit ae946964 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge changes Ic9b16732,I8d1cb2e2 into cm-10.1 

* changes:
  change "next" to "done" in minute IME option under 24-hour format
  Fix incorrect fragment animation used for hiding fragments
parents eae9890b e6560741

core/java/android/app/FragmentManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1169,7 +1169,7 @@ final class FragmentManagerImpl extends FragmentManager { 
        if (!fragment.mHidden) {

            fragment.mHidden = true;

            if (fragment.mView != null) {

                Animator anim = loadAnimator(fragment, transition, true,

                Animator anim = loadAnimator(fragment, transition, false,

                        transitionStyle);

                if (anim != null) {

                    anim.setTarget(fragment.mView);

core/java/android/widget/TimePicker.java

+10 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ public class TimePicker extends FrameLayout { 


        // update controls to initial state

        updateHourControl();

        updateMinuteControl();

        updateAmPmControl();



        setOnTimeChangedListener(NO_OP_CHANGE_LISTENER);
@@ -428,6 +429,7 @@ public class TimePicker extends FrameLayout { 
        updateHourControl();

        // set value after spinner range is updated

        setCurrentHour(currentHour);

        updateMinuteControl();

        updateAmPmControl();

    }
@@ -508,6 +510,14 @@ public class TimePicker extends FrameLayout { 
        }

    }



    private void updateMinuteControl() {

        if (is24HourView()) {

            mMinuteSpinnerInput.setImeOptions(EditorInfo.IME_ACTION_DONE);

        } else {

            mMinuteSpinnerInput.setImeOptions(EditorInfo.IME_ACTION_NEXT);

        }

    }



    private void updateAmPmControl() {

        if (is24HourView()) {

            if (mAmPmSpinner != null) {