Fix bug 3362375 - API REVIEW: remove unused public 'up' id

Fix bug 3362453 - API REVIEW: android.app.ActionBar

Change-Id: I4e0233cd9355a47682bfe7b4a7fda39801586f1a

1 files changed, 0 insertions, 91 deletions

diff --git a/core/java/android/app/ActionBar.java b/core/java/android/app/ActionBar.java
index 8d5a6da..fc5fac6 100644
--- a/core/java/android/app/ActionBar.java
+++ b/core/java/android/app/ActionBar.java
@@ -49,12 +49,6 @@ public abstract class ActionBar {
      * e.g. this might be presented to the user as a dropdown list.
      */
     public static final int NAVIGATION_MODE_LIST = 1;
-
-    /**
-     * @deprecated use NAVIGATION_MODE_LIST
-     */
-    @Deprecated
-    public static final int NAVIGATION_MODE_DROPDOWN_LIST = 1;
     
     /**
      * Tab navigation mode. Instead of static title text this mode
@@ -81,13 +75,6 @@ public abstract class ActionBar {
     public static final int DISPLAY_SHOW_HOME = 0x2;
 
     /**
-     * @deprecated Display flags are now positive for consistency - 'show' instead of 'hide'.
-     *             Use DISPLAY_SHOW_HOME.
-     */
-    @Deprecated
-    public static final int DISPLAY_HIDE_HOME = 0x1000;
-
-    /**
      * Display the 'home' element such that it appears as an 'up' affordance.
      * e.g. show an arrow to the left indicating the action that will be taken.
      *
@@ -173,28 +160,6 @@ public abstract class ActionBar {
     public abstract void setCustomView(int resId);
 
     /**
-     * @param view
-     * @deprecated Use {@link #setCustomView(View)} and {@link #setDisplayOptions(int)} instead.
-     */
-    @Deprecated
-    public abstract void setCustomNavigationMode(View view);
-    
-    /**
-     * Set the action bar into dropdown navigation mode and supply an adapter
-     * that will provide views for navigation choices.
-     * 
-     * @param adapter An adapter that will provide views both to display
-     *                the current navigation selection and populate views
-     *                within the dropdown navigation menu.
-     * @param callback A OnNavigationListener that will receive events when the user
-     *                 selects a navigation item.
-     * @deprecated See setListNavigationCallbacks.
-     */
-    @Deprecated
-    public abstract void setDropdownNavigationMode(SpinnerAdapter adapter,
-            OnNavigationListener callback);
-
-    /**
      * Set the adapter and navigation callback for list navigation mode.
      *
      * The supplied adapter will provide views for the expanded list as well as
@@ -213,23 +178,6 @@ public abstract class ActionBar {
             OnNavigationListener callback);
 
     /**
-     * Set the action bar into dropdown navigation mode and supply an adapter that will
-     * provide views for navigation choices.
-     *
-     * @param adapter An adapter that will provide views both to display the current
-     *                navigation selection and populate views within the dropdown
-     *                navigation menu.
-     * @param callback A OnNavigationListener that will receive events when the user
-     *                 selects a navigation item.
-     * @param defaultSelectedPosition Position within the provided adapter that should be
-     *                                selected from the outset.
-     * @deprecated See setListNavigationCallbacks and setSelectedNavigationItem.
-     */
-    @Deprecated
-    public abstract void setDropdownNavigationMode(SpinnerAdapter adapter,
-            OnNavigationListener callback, int defaultSelectedPosition);
-
-    /**
      * Set the selected navigation item in list or tabbed navigation modes.
      *
      * @param position Position of the item to select.
@@ -240,15 +188,6 @@ public abstract class ActionBar {
      * Get the position of the selected navigation item in list or tabbed navigation modes.
      *
      * @return Position of the selected item.
-     * @deprecated Use {@link #getSelectedNavigationIndex()} instead.
-     */
-    @Deprecated
-    public abstract int getSelectedNavigationItem();
-
-    /**
-     * Get the position of the selected navigation item in list or tabbed navigation modes.
-     *
-     * @return Position of the selected item.
      */
     public abstract int getSelectedNavigationIndex();
 
@@ -260,17 +199,6 @@ public abstract class ActionBar {
     public abstract int getNavigationItemCount();
 
     /**
-     * Set the action bar into standard navigation mode, using the currently set title
-     * and/or subtitle.
-     *
-     * Standard navigation mode is default. The title is automatically set to the name of
-     * your Activity on startup if an action bar is present.
-     * @deprecated See setNavigationMode
-     */
-    @Deprecated
-    public abstract void setStandardNavigationMode();
-
-    /**
      * Set the action bar's title. This will only be displayed if
      * {@link #DISPLAY_SHOW_TITLE} is set.
      *
@@ -410,13 +338,6 @@ public abstract class ActionBar {
      * @param d Background drawable
      */
     public abstract void setBackgroundDrawable(Drawable d);
-    
-    /**
-     * @return The current custom navigation view.
-     * @deprecated Method has been renamed. Use {@link #getCustomView()}.
-     */
-    @Deprecated
-    public abstract View getCustomNavigationView();
 
     /**
      * @return The current custom view.
@@ -476,18 +397,6 @@ public abstract class ActionBar {
     public abstract int getDisplayOptions();
 
     /**
-     * Set the action bar into tabbed navigation mode.
-     *
-     * @see #addTab(Tab)
-     * @see #insertTab(Tab, int)
-     * @see #removeTab(Tab)
-     * @see #removeTabAt(int)
-     *
-     * @deprecated See {@link #setNavigationMode(int)}
-     */
-    public abstract void setTabNavigationMode();
-
-    /**
      * Create and return a new {@link Tab}.
      * This tab will not be included in the action bar until it is added.
      *