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

Commit 9c91c7e2 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 3362375 - API REVIEW: remove unused public 'up' id" into honeycomb

parents 7fb8b565 1264c331

api/11.xml

+0 −122
Original line number Diff line number Diff line
@@ -13977,17 +13977,6 @@ 
 visibility="public"

>

</field>

<field name="up"

 type="int"

 transient="false"

 volatile="false"

 value="16908334"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="widget_frame"

 type="int"

 transient="false"
@@ -21602,17 +21591,6 @@ 
<parameter name="setSelected" type="boolean">

</parameter>

</method>

<method name="getCustomNavigationView"

 return="android.view.View"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

</method>

<method name="getCustomView"

 return="android.view.View"

 abstract="true"
@@ -21679,17 +21657,6 @@ 
 visibility="public"

>

</method>

<method name="getSelectedNavigationItem"

 return="int"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

</method>

<method name="getSelectedTab"

 return="android.app.ActionBar.Tab"

 abstract="true"
@@ -21856,19 +21823,6 @@ 
<parameter name="d" type="android.graphics.drawable.Drawable">

</parameter>

</method>

<method name="setCustomNavigationMode"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="view" type="android.view.View">

</parameter>

</method>

<method name="setCustomView"

 return="void"

 abstract="true"
@@ -22003,38 +21957,6 @@ 
<parameter name="useLogo" type="boolean">

</parameter>

</method>

<method name="setDropdownNavigationMode"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="adapter" type="android.widget.SpinnerAdapter">

</parameter>

<parameter name="callback" type="android.app.ActionBar.OnNavigationListener">

</parameter>

</method>

<method name="setDropdownNavigationMode"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="adapter" type="android.widget.SpinnerAdapter">

</parameter>

<parameter name="callback" type="android.app.ActionBar.OnNavigationListener">

</parameter>

<parameter name="defaultSelectedPosition" type="int">

</parameter>

</method>

<method name="setListNavigationCallbacks"

 return="void"

 abstract="true"
@@ -22076,17 +21998,6 @@ 
<parameter name="position" type="int">

</parameter>

</method>

<method name="setStandardNavigationMode"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

</method>

<method name="setSubtitle"

 return="void"

 abstract="true"
@@ -22113,17 +22024,6 @@ 
<parameter name="resId" type="int">

</parameter>

</method>

<method name="setTabNavigationMode"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

</method>

<method name="setTitle"

 return="void"

 abstract="true"
@@ -22161,17 +22061,6 @@ 
 visibility="public"

>

</method>

<field name="DISPLAY_HIDE_HOME"

 type="int"

 transient="false"

 volatile="false"

 value="4096"

 static="true"

 final="true"

 deprecated="deprecated"

 visibility="public"

>

</field>

<field name="DISPLAY_HOME_AS_UP"

 type="int"

 transient="false"
@@ -22227,17 +22116,6 @@ 
 visibility="public"

>

</field>

<field name="NAVIGATION_MODE_DROPDOWN_LIST"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="deprecated"

 visibility="public"

>

</field>

<field name="NAVIGATION_MODE_LIST"

 type="int"

 transient="false"

api/current.xml

+0 −122
Original line number Diff line number Diff line
@@ -13977,17 +13977,6 @@ 
 visibility="public"

>

</field>

<field name="up"

 type="int"

 transient="false"

 volatile="false"

 value="16908334"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="widget_frame"

 type="int"

 transient="false"
@@ -21602,17 +21591,6 @@ 
<parameter name="setSelected" type="boolean">

</parameter>

</method>

<method name="getCustomNavigationView"

 return="android.view.View"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

</method>

<method name="getCustomView"

 return="android.view.View"

 abstract="true"
@@ -21679,17 +21657,6 @@ 
 visibility="public"

>

</method>

<method name="getSelectedNavigationItem"

 return="int"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

</method>

<method name="getSelectedTab"

 return="android.app.ActionBar.Tab"

 abstract="true"
@@ -21856,19 +21823,6 @@ 
<parameter name="d" type="android.graphics.drawable.Drawable">

</parameter>

</method>

<method name="setCustomNavigationMode"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="view" type="android.view.View">

</parameter>

</method>

<method name="setCustomView"

 return="void"

 abstract="true"
@@ -22003,38 +21957,6 @@ 
<parameter name="useLogo" type="boolean">

</parameter>

</method>

<method name="setDropdownNavigationMode"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="adapter" type="android.widget.SpinnerAdapter">

</parameter>

<parameter name="callback" type="android.app.ActionBar.OnNavigationListener">

</parameter>

</method>

<method name="setDropdownNavigationMode"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="adapter" type="android.widget.SpinnerAdapter">

</parameter>

<parameter name="callback" type="android.app.ActionBar.OnNavigationListener">

</parameter>

<parameter name="defaultSelectedPosition" type="int">

</parameter>

</method>

<method name="setListNavigationCallbacks"

 return="void"

 abstract="true"
@@ -22076,17 +21998,6 @@ 
<parameter name="position" type="int">

</parameter>

</method>

<method name="setStandardNavigationMode"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

</method>

<method name="setSubtitle"

 return="void"

 abstract="true"
@@ -22113,17 +22024,6 @@ 
<parameter name="resId" type="int">

</parameter>

</method>

<method name="setTabNavigationMode"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

</method>

<method name="setTitle"

 return="void"

 abstract="true"
@@ -22161,17 +22061,6 @@ 
 visibility="public"

>

</method>

<field name="DISPLAY_HIDE_HOME"

 type="int"

 transient="false"

 volatile="false"

 value="4096"

 static="true"

 final="true"

 deprecated="deprecated"

 visibility="public"

>

</field>

<field name="DISPLAY_HOME_AS_UP"

 type="int"

 transient="false"
@@ -22227,17 +22116,6 @@ 
 visibility="public"

>

</field>

<field name="NAVIGATION_MODE_DROPDOWN_LIST"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="deprecated"

 visibility="public"

>

</field>

<field name="NAVIGATION_MODE_LIST"

 type="int"

 transient="false"

core/java/android/app/ActionBar.java

+0 −91
Original line number Diff line number Diff line
@@ -50,12 +50,6 @@ public abstract class ActionBar { 
     */

    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

     * presents a series of tabs for navigation within the activity.
@@ -80,13 +74,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.
@@ -172,28 +159,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.

     *
@@ -212,23 +177,6 @@ public abstract class ActionBar { 
    public abstract void setListNavigationCallbacks(SpinnerAdapter adapter,

            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.

     *
@@ -236,15 +184,6 @@ public abstract class ActionBar { 
     */

    public abstract void setSelectedNavigationItem(int position);



    /**

     * 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.

     *
@@ -259,17 +198,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.
@@ -411,13 +339,6 @@ public abstract class ActionBar { 
     */

    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.

     */
@@ -475,18 +396,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.

core/java/android/app/FragmentBreadCrumbs.java

+3 −3
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ import android.widget.TextView; 
/**

 * Helper class for showing "bread crumbs" representing the fragment

 * stack in an activity.  This is intended to be used with

 * {@link ActionBar#setCustomNavigationMode(View)

 * ActionBar.setCustomNavigationMode(View)} to place the bread crumbs in

 * the navigation area of the action bar.

 * {@link ActionBar#setCustomView(View)

 * ActionBar.setCustomView(View)} to place the bread crumbs in

 * the action bar.

 *

 * <p>The default style for this view is

 * {@link android.R.style#Widget_FragmentBreadCrumbs}.

core/java/android/preference/PreferenceActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -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);