diff options
| -rw-r--r-- | api/current.xml | 17 | ||||
| -rw-r--r-- | core/java/android/preference/PreferenceActivity.java | 14 |
2 files changed, 7 insertions, 24 deletions
diff --git a/api/current.xml b/api/current.xml index ef3289d86602..5ed07cf7fcbb 100644 --- a/api/current.xml +++ b/api/current.xml @@ -145399,23 +145399,6 @@ <parameter name="header" type="android.preference.PreferenceActivity.Header"> </parameter> </method> -<method name="switchToHeaderInner" - return="void" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="fragmentName" type="java.lang.String"> -</parameter> -<parameter name="args" type="android.os.Bundle"> -</parameter> -<parameter name="next" type="boolean"> -</parameter> -</method> <field name="EXTRA_NO_HEADERS" type="java.lang.String" transient="false" diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index a59b2f805c9a..0c6a237061c4 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -893,13 +893,13 @@ public abstract class PreferenceActivity extends ListActivity implements } } - public void switchToHeaderInner(String fragmentName, Bundle args, boolean next) { + private void switchToHeaderInner(String fragmentName, Bundle args, int direction) { getFragmentManager().popBackStack(BACK_STACK_PREFS, POP_BACK_STACK_INCLUSIVE); Fragment f = Fragment.instantiate(this, fragmentName, args); FragmentTransaction transaction = getFragmentManager().openTransaction(); - transaction.setTransition(next ? - FragmentTransaction.TRANSIT_FRAGMENT_NEXT : - FragmentTransaction.TRANSIT_FRAGMENT_PREV); + transaction.setTransition(direction == 0 ? FragmentTransaction.TRANSIT_NONE + : direction > 0 ? FragmentTransaction.TRANSIT_FRAGMENT_NEXT + : FragmentTransaction.TRANSIT_FRAGMENT_PREV); transaction.replace(com.android.internal.R.id.prefs, f); transaction.commit(); } @@ -913,7 +913,7 @@ public abstract class PreferenceActivity extends ListActivity implements */ public void switchToHeader(String fragmentName, Bundle args) { setSelectedHeader(null); - switchToHeaderInner(fragmentName, args, true); + switchToHeaderInner(fragmentName, args, 0); } /** @@ -923,8 +923,8 @@ public abstract class PreferenceActivity extends ListActivity implements * @param header The new header to display. */ public void switchToHeader(Header header) { - switchToHeaderInner(header.fragment, header.fragmentArguments, - mHeaders.indexOf(header) > mHeaders.indexOf(mCurHeader)); + int direction = mHeaders.indexOf(header) - mHeaders.indexOf(mCurHeader); + switchToHeaderInner(header.fragment, header.fragmentArguments, direction); setSelectedHeader(header); } |