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

Commit 9ff64838 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1

parents 9fffd9a8 cf407ad8

api/current.xml

+12 −1
Original line number Diff line number Diff line
@@ -28643,6 +28643,17 @@ 
 visibility="public"

>

</method>

<method name="dismissAllowingStateLoss"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getDialog"

 return="android.app.Dialog"

 abstract="false"
@@ -267031,7 +267042,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="t" type="T">

<parameter name="arg0" type="T">

</parameter>

</method>

</interface>

core/java/android/app/DialogFragment.java

+10 −0
Original line number Diff line number Diff line
@@ -258,6 +258,16 @@ public class DialogFragment extends Fragment 
        dismissInternal(false);

    }



    /**

     * Version of {@link #dismiss()} that uses

     * {@link FragmentTransaction#commitAllowingStateLoss()

     * FragmentTransaction.commitAllowingStateLoss()}.  See linked

     * documentation for further details.

     */

    public void dismissAllowingStateLoss() {

        dismissInternal(true);

    }

    

    void dismissInternal(boolean allowStateLoss) {

        if (mDismissed) {

            return;

core/java/android/preference/PreferenceActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ public abstract class PreferenceActivity extends ListActivity implements 
        FragmentTransaction transaction = getFragmentManager().beginTransaction();

        transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);

        transaction.replace(com.android.internal.R.id.prefs, f);

        transaction.commit();

        transaction.commitAllowingStateLoss();

    }



    /**
@@ -1144,7 +1144,7 @@ public abstract class PreferenceActivity extends ListActivity implements 
        } else {

            transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);

        }

        transaction.commit();

        transaction.commitAllowingStateLoss();

    }



    /**
@@ -1184,7 +1184,7 @@ public abstract class PreferenceActivity extends ListActivity implements 
            }

            transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);

            transaction.addToBackStack(BACK_STACK_PREFS);

            transaction.commit();

            transaction.commitAllowingStateLoss();

        }

    }