Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7cec5430: Merge change 24903 into eclair

Browse Source 
Merge commit '7cec54302d421dd8c45ea25456b9677a7aa3d8d3' into eclair-plus-aosp

* commit '7cec54302d421dd8c45ea25456b9677a7aa3d8d3':
  Fix some LayoutBridge javadoc.
This commit is contained in:
Raphael
2009-09-14 12:12:51 -07:00
committed by Android Git Automerger
parent 76d82371a9 7cec54302d
commit d2bb9eae17
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/layoutlib/api/src/com/android/layoutlib/api/ILayoutBridge.java
View File

@@ -88,7 +88,7 @@ public interface ILayoutBridge {
* @param projectCallback The {@link IProjectCallback} object to get information from * @param projectCallback The {@link IProjectCallback} object to get information from
* the project. * the project.
* @param logger the object responsible for displaying warning/errors to the user. * @param logger the object responsible for displaying warning/errors to the user.
* @return an {@link ILayoutResult} object that contains the result of the layout. * @return a new {@link ILayoutResult} object that contains the result of the layout.
* @since 4 * @since 4
*/ */
ILayoutResult computeLayout(IXmlPullParser layoutDescription, ILayoutResult computeLayout(IXmlPullParser layoutDescription,
@@ -123,7 +123,7 @@ public interface ILayoutBridge {
* @param projectCallback The {@link IProjectCallback} object to get information from * @param projectCallback The {@link IProjectCallback} object to get information from
* the project. * the project.
* @param logger the object responsible for displaying warning/errors to the user. * @param logger the object responsible for displaying warning/errors to the user.
* @return an {@link ILayoutResult} object that contains the result of the layout. * @return a new {@link ILayoutResult} object that contains the result of the layout.
* @since 3 * @since 3
*/ */
@Deprecated @Deprecated
@@ -155,7 +155,7 @@ public interface ILayoutBridge {
* @param projectCallback The {@link IProjectCallback} object to get information from * @param projectCallback The {@link IProjectCallback} object to get information from
* the project. * the project.
* @param logger the object responsible for displaying warning/errors to the user. * @param logger the object responsible for displaying warning/errors to the user.
* @return an {@link ILayoutResult} object that contains the result of the layout. * @return a new {@link ILayoutResult} object that contains the result of the layout.
* @deprecated Use {@link #computeLayout(IXmlPullParser, Object, int, int, int, float, float, String, boolean, Map, Map, IProjectCallback, ILayoutLog)} * @deprecated Use {@link #computeLayout(IXmlPullParser, Object, int, int, int, float, float, String, boolean, Map, Map, IProjectCallback, ILayoutLog)}
* @since 2 * @since 2
*/ */
@@ -187,7 +187,7 @@ public interface ILayoutBridge {
* @param projectCallback The {@link IProjectCallback} object to get information from * @param projectCallback The {@link IProjectCallback} object to get information from
* the project. * the project.
* @param logger the object responsible for displaying warning/errors to the user. * @param logger the object responsible for displaying warning/errors to the user.
* @return an {@link ILayoutResult} object that contains the result of the layout. * @return a new {@link ILayoutResult} object that contains the result of the layout.
* @deprecated Use {@link #computeLayout(IXmlPullParser, Object, int, int, int, float, float, String, boolean, Map, Map, IProjectCallback, ILayoutLog)} * @deprecated Use {@link #computeLayout(IXmlPullParser, Object, int, int, int, float, float, String, boolean, Map, Map, IProjectCallback, ILayoutLog)}
* @since 1 * @since 1
*/ */
@@ -205,7 +205,7 @@ public interface ILayoutBridge {
* until this method is called. * until this method is called.
* <p/>The cache is not configuration dependent and should only be cleared when a * <p/>The cache is not configuration dependent and should only be cleared when a
* resource changes (at this time only bitmaps and 9 patches go into the cache). * resource changes (at this time only bitmaps and 9 patches go into the cache).
* @param objectKey the key for the project. * @param projectKey the key for the project.
* @since 1 * @since 1
*/ */
void clearCaches(Object projectKey); void clearCaches(Object projectKey);

10
tools/layoutlib/api/src/com/android/layoutlib/api/ILayoutResult.java
View File

@@ -23,10 +23,14 @@ import java.awt.image.BufferedImage;
* {@link ILayoutLibBridge#computeLayout(IXmlPullParser, int, int, String, java.util.Map, java.util.Map, java.util.Map, IFontLoader, ILayoutLibLog, ICustomViewLoader)} * {@link ILayoutLibBridge#computeLayout(IXmlPullParser, int, int, String, java.util.Map, java.util.Map, java.util.Map, IFontLoader, ILayoutLibLog, ICustomViewLoader)}
*/ */
public interface ILayoutResult { public interface ILayoutResult {
/** Sucess return code */ /**
* Success return code
*/
final static int SUCCESS = 0; final static int SUCCESS = 0;
/** Error return code.
* <p/>See {@link #getErrorMessage()} /**
* Error return code, in which case an error message is guaranteed to be defined.
* @See {@link #getErrorMessage()}
*/ */
final static int ERROR = 1; final static int ERROR = 1;