am 0e2de6d7: Addressing API Review docs bugs:

* commit '0e2de6d7187ef67ec00a2f2544450caa4a239c39':
  Addressing API Review docs bugs:
This commit is contained in:
Adam Cohen
2011-01-20 00:10:59 -08:00
committed by Android Git Automerger
7 changed files with 106 additions and 27 deletions

View File

@@ -240630,6 +240630,17 @@
visibility="public" visibility="public"
> >
</method> </method>
<method name="fyiWillBeAdvancedByHostKThx"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getAdapter" <method name="getAdapter"
return="android.widget.Adapter" return="android.widget.Adapter"
abstract="false" abstract="false"
@@ -240885,17 +240896,6 @@
visibility="public" visibility="public"
> >
</method> </method>
<method name="willBeAdvancedByHost"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
</class> </class>
<class name="AdapterViewFlipper" <class name="AdapterViewFlipper"
extends="android.widget.AdapterViewAnimator" extends="android.widget.AdapterViewAnimator"

View File

@@ -242114,6 +242114,17 @@
visibility="public" visibility="public"
> >
</method> </method>
<method name="fyiWillBeAdvancedByHostKThx"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getAdapter" <method name="getAdapter"
return="android.widget.Adapter" return="android.widget.Adapter"
abstract="false" abstract="false"
@@ -242369,17 +242380,6 @@
visibility="public" visibility="public"
> >
</method> </method>
<method name="willBeAdvancedByHost"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
</class> </class>
<class name="AdapterViewFlipper" <class name="AdapterViewFlipper"
extends="android.widget.AdapterViewAnimator" extends="android.widget.AdapterViewAnimator"
@@ -261810,7 +261810,7 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<parameter name="arg0" type="T"> <parameter name="t" type="T">
</parameter> </parameter>
</method> </method>
</interface> </interface>

View File

@@ -981,11 +981,21 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
// items from the Adapter. // items from the Adapter.
} }
/**
* Called by an {@link android.appwidget.AppWidgetHost} in order to advance the current view when
* it is being used within an app widget.
*/
public void advance() { public void advance() {
showNext(); showNext();
} }
public void willBeAdvancedByHost() { /**
* Called by an {@link android.appwidget.AppWidgetHost} to indicate that it will be
* automatically advancing the views of this {@link AdapterViewAnimator} by calling
* {@link AdapterViewAnimator#advance()} at some point in the future. This allows subclasses to
* perform any required setup, for example, to stop automatically advancing their children.
*/
public void fyiWillBeAdvancedByHostKThx() {
} }
@Override @Override

View File

@@ -258,8 +258,14 @@ public class AdapterViewFlipper extends AdapterViewAnimator {
} }
}; };
/**
* Called by an {@link android.appwidget.AppWidgetHost} to indicate that it will be
* automatically advancing the views of this {@link AdapterViewFlipper} by calling
* {@link AdapterViewFlipper#advance()} at some point in the future. This allows
* {@link AdapterViewFlipper} to prepare by no longer Advancing its children.
*/
@Override @Override
public void willBeAdvancedByHost() { public void fyiWillBeAdvancedByHostKThx() {
mAdvancedByHost = true; mAdvancedByHost = true;
updateRunning(false); updateRunning(false);
} }

View File

@@ -34,5 +34,5 @@ public interface Advanceable {
* Called by the AppWidgetHost once before it begins to call advance(), allowing the * Called by the AppWidgetHost once before it begins to call advance(), allowing the
* collection to do any required setup. * collection to do any required setup.
*/ */
public void willBeAdvancedByHost(); public void fyiWillBeAdvancedByHostKThx();
} }

View File

@@ -42,7 +42,7 @@ public abstract class RemoteViewsService extends Service {
/** /**
* An interface for an adapter between a remote collection view (ListView, GridView, etc) and * An interface for an adapter between a remote collection view (ListView, GridView, etc) and
* the underlying data for that view. The implementor is responsible for making a RemoteView * the underlying data for that view. The implementor is responsible for making a RemoteView
* for each item in the data set. * for each item in the data set. This interface is a thin wrapper around {@link Adapter}.
* *
* @see android.widget.Adapter * @see android.widget.Adapter
* @see android.appwidget.AppWidgetManager * @see android.appwidget.AppWidgetManager
@@ -53,24 +53,72 @@ public abstract class RemoteViewsService extends Service {
* multiple RemoteViewAdapters depending on the intent passed. * multiple RemoteViewAdapters depending on the intent passed.
*/ */
public void onCreate(); public void onCreate();
/** /**
* Called when notifyDataSetChanged() is triggered on the remote adapter. This allows a * Called when notifyDataSetChanged() is triggered on the remote adapter. This allows a
* RemoteViewsFactory to respond to data changes by updating any internal references. * RemoteViewsFactory to respond to data changes by updating any internal references.
* *
* Note: expensive tasks can be safely performed synchronously within this method. In the
* interim, the old data will be displayed within the widget.
*
* @see android.appwidget.AppWidgetManager#notifyAppWidgetViewDataChanged(int[], int) * @see android.appwidget.AppWidgetManager#notifyAppWidgetViewDataChanged(int[], int)
*/ */
public void onDataSetChanged(); public void onDataSetChanged();
/** /**
* Called when the last RemoteViewsAdapter that is associated with this factory is * Called when the last RemoteViewsAdapter that is associated with this factory is
* unbound. * unbound.
*/ */
public void onDestroy(); public void onDestroy();
/**
* See {@link Adapter#getCount()}
*
* @return Count of items.
*/
public int getCount(); public int getCount();
/**
* See {@link Adapter#getView(int, android.view.View, android.view.ViewGroup)}.
*
* Note: expensive tasks can be safely performed synchronously within this method, and a
* loading view will be displayed in the interim. See {@link #getLoadingView()}.
*
* @param position The position of the item within the Factory's data set of the item whose
* view we want.
* @return A RemoteViews object corresponding to the data at the specified position.
*/
public RemoteViews getViewAt(int position); public RemoteViews getViewAt(int position);
/**
* This allows for the use of a custom loading view which appears between the time that
* {@link #getViewAt(int)} is called and returns. If null is returned, a default loading
* view will be used.
*
* @return The RemoteViews representing the desired loading view.
*/
public RemoteViews getLoadingView(); public RemoteViews getLoadingView();
/**
* See {@link Adapter#getViewTypeCount()}.
*
* @return The number of types of Views that will be returned by this factory.
*/
public int getViewTypeCount(); public int getViewTypeCount();
/**
* See {@link Adapter#getItemId(int)}.
*
* @param position The position of the item within the data set whose row id we want.
* @return The id of the item at the specified position.
*/
public long getItemId(int position); public long getItemId(int position);
/**
* See {@link Adapter#hasStableIds()}.
*
* @return True if the same id always refers to the same object.
*/
public boolean hasStableIds(); public boolean hasStableIds();
} }

View File

@@ -347,6 +347,9 @@ public class StackView extends AdapterViewAnimator {
} }
} }
/**
* {@inheritDoc}
*/
@Override @Override
@android.view.RemotableViewMethod @android.view.RemotableViewMethod
public void showNext() { public void showNext() {
@@ -362,6 +365,9 @@ public class StackView extends AdapterViewAnimator {
super.showNext(); super.showNext();
} }
/**
* {@inheritDoc}
*/
@Override @Override
@android.view.RemotableViewMethod @android.view.RemotableViewMethod
public void showPrevious() { public void showPrevious() {
@@ -474,6 +480,9 @@ public class StackView extends AdapterViewAnimator {
} }
} }
/**
* {@inheritDoc}
*/
@Override @Override
public boolean onInterceptTouchEvent(MotionEvent ev) { public boolean onInterceptTouchEvent(MotionEvent ev) {
int action = ev.getAction(); int action = ev.getAction();
@@ -561,6 +570,9 @@ public class StackView extends AdapterViewAnimator {
} }
} }
/**
* {@inheritDoc}
*/
@Override @Override
public boolean onTouchEvent(MotionEvent ev) { public boolean onTouchEvent(MotionEvent ev) {
super.onTouchEvent(ev); super.onTouchEvent(ev);
@@ -939,6 +951,9 @@ public class StackView extends AdapterViewAnimator {
} }
} }
/**
* {@inheritDoc}
*/
@Override @Override
public void onRemoteAdapterConnected() { public void onRemoteAdapterConnected() {
super.onRemoteAdapterConnected(); super.onRemoteAdapterConnected();