The default style for this view is
* {@link android.R.style#Widget_FragmentBreadCrumbs}.
diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java
index 3883451e4b23d..2b609ea7ed6c5 100644
--- a/core/java/android/preference/PreferenceActivity.java
+++ b/core/java/android/preference/PreferenceActivity.java
@@ -998,7 +998,9 @@ public abstract class PreferenceActivity extends ListActivity implements
mFragmentBreadCrumbs = new FragmentBreadCrumbs(this);
ActionBar actionBar = getActionBar();
if (actionBar != null) {
- actionBar.setCustomNavigationMode(mFragmentBreadCrumbs);
+ actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+ ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM);
+ actionBar.setCustomView(mFragmentBreadCrumbs);
}
}
mFragmentBreadCrumbs.setMaxVisible(2);
diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java
index a8eb6fe04047c..b1b5d71582841 100644
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -277,36 +277,6 @@ public class ActionBarImpl extends ActionBar {
setSubtitle(mContext.getString(resId));
}
- public void setCustomNavigationMode(View view) {
- cleanupTabs();
- setCustomView(view);
- setDisplayOptions(DISPLAY_SHOW_CUSTOM, DISPLAY_SHOW_CUSTOM | DISPLAY_SHOW_TITLE);
- mActionView.setNavigationMode(NAVIGATION_MODE_STANDARD);
- mActionView.setCallback(null);
- }
-
- public void setDropdownNavigationMode(SpinnerAdapter adapter, OnNavigationListener callback) {
- setDropdownNavigationMode(adapter, callback, -1);
- }
-
- public void setDropdownNavigationMode(SpinnerAdapter adapter, OnNavigationListener callback,
- int defaultSelectedPosition) {
- cleanupTabs();
- setDisplayOptions(0, DISPLAY_SHOW_CUSTOM | DISPLAY_SHOW_TITLE);
- mActionView.setNavigationMode(NAVIGATION_MODE_LIST);
- setListNavigationCallbacks(adapter, callback);
- if (defaultSelectedPosition >= 0) {
- mActionView.setDropdownSelectedPosition(defaultSelectedPosition);
- }
- }
-
- public void setStandardNavigationMode() {
- cleanupTabs();
- setDisplayOptions(DISPLAY_SHOW_TITLE, DISPLAY_SHOW_TITLE | DISPLAY_SHOW_CUSTOM);
- mActionView.setNavigationMode(NAVIGATION_MODE_STANDARD);
- mActionView.setCallback(null);
- }
-
public void setSelectedNavigationItem(int position) {
switch (mActionView.getNavigationMode()) {
case NAVIGATION_MODE_TABS:
@@ -321,10 +291,6 @@ public class ActionBarImpl extends ActionBar {
}
}
- public int getSelectedNavigationItem() {
- return getSelectedNavigationIndex();
- }
-
public void removeAllTabs() {
cleanupTabs();
}
@@ -359,10 +325,6 @@ public class ActionBarImpl extends ActionBar {
mContainerView.setBackgroundDrawable(d);
}
- public View getCustomNavigationView() {
- return getCustomView();
- }
-
public View getCustomView() {
return mActionView.getCustomNavigationView();
}
@@ -476,16 +438,6 @@ public class ActionBarImpl extends ActionBar {
}
}
- @Override
- public void setTabNavigationMode() {
- if (mActivity == null) {
- throw new IllegalStateException(
- "Tab navigation mode cannot be used outside of an Activity");
- }
- setDisplayOptions(0, DISPLAY_SHOW_TITLE | DISPLAY_SHOW_CUSTOM);
- mActionView.setNavigationMode(NAVIGATION_MODE_TABS);
- }
-
@Override
public void selectTab(Tab tab) {
if (getNavigationMode() != NAVIGATION_MODE_TABS) {
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index 297dde78254b3..d44d4a556286a 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -370,12 +370,6 @@ public class ActionBarView extends ViewGroup {
}
public void setDisplayOptions(int options) {
- // TODO Remove this once DISPLAY_HIDE_HOME is removed
- if ((options & ActionBar.DISPLAY_HIDE_HOME) != 0) {
- options &= ~(ActionBar.DISPLAY_HIDE_HOME | ActionBar.DISPLAY_SHOW_HOME);
- }
- // End TODO
-
final int flagsChanged = options ^ mDisplayOptions;
mDisplayOptions = options;
if ((flagsChanged & DISPLAY_RELAYOUT_MASK) != 0) {
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index b9caeb38d12d1..fbd5b5e812346 100755
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -4648,8 +4648,6 @@
-
-
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index a30e31689ac92..786c4d080acfd 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1468,7 +1468,6 @@
-
diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd
index c17fc3cc94934..376bf6a9c8443 100644
--- a/docs/html/guide/topics/ui/actionbar.jd
+++ b/docs/html/guide/topics/ui/actionbar.jd
@@ -425,7 +425,7 @@ to call {@link android.app.FragmentTransaction#commit} for these transactions. Y
If your activity is stopped, you should retain the currently selected tab with the saved state so
that when the user returns to your application, you can open the tab. When it's time to save the
state, you can query the currently selected tab with {@link
-android.app.ActionBar#getSelectedNavigationItem()}. This returns the index position of the selected
+android.app.ActionBar#getSelectedNavigationIndex()}. This returns the index position of the selected
tab.
Caution: It's important that you save