diff options
| author | Scott Main <smain@google.com> | 2010-07-15 11:23:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 11:23:08 -0700 |
| commit | 4fd416880e53c172bac4a51b2eafea699b58badf (patch) | |
| tree | 65ba0abf51ee25e98fed39e60beeb9936a44f7eb /core | |
| parent | b068b47c6d0214256116a0c661740bddf7acc18c (diff) | |
| parent | 5352d2378d2f92ebe0657e4caedb4498492fc404 (diff) | |
| download | frameworks_base-4fd416880e53c172bac4a51b2eafea699b58badf.zip frameworks_base-4fd416880e53c172bac4a51b2eafea699b58badf.tar.gz frameworks_base-4fd416880e53c172bac4a51b2eafea699b58badf.tar.bz2 | |
am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo
Merge commit '5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp
* commit '5352d2378d2f92ebe0657e4caedb4498492fc404':
docs: lots of additions to the resources docs
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/View.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 329b2e7..c3f81a2 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -7900,7 +7900,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility * without resorting to another data structure. * * The specified key should be an id declared in the resources of the - * application to ensure it is unique. Keys identified as belonging to + * application to ensure it is unique (see the <a + * href={@docRoot}guide/topics/resources/more-resources.html#Id">ID resource type</a>). + * Keys identified as belonging to * the Android framework or not associated with any package will cause * an {@link IllegalArgumentException} to be thrown. * |