summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2012-11-06 15:58:08 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-06 15:58:08 -0800
commita1ca6d39f9c0089aaab05249269ee8fbfe66f035 (patch)
tree4a648ff4ef6e77d258730c4aa30fa202ab5cfc66 /core
parentb5f27ddb3e56929db3cc9f4705a760caea371eb7 (diff)
parenta75a41e9b12c90638fbff9ce69b2820f334bdda3 (diff)
downloadframeworks_base-a1ca6d39f9c0089aaab05249269ee8fbfe66f035.zip
frameworks_base-a1ca6d39f9c0089aaab05249269ee8fbfe66f035.tar.gz
frameworks_base-a1ca6d39f9c0089aaab05249269ee8fbfe66f035.tar.bz2
am a75a41e9: am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation."
* commit 'a75a41e9b12c90638fbff9ce69b2820f334bdda3': Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/ViewStub.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/ViewStub.java b/core/java/android/view/ViewStub.java
index 69a26c2..a5dc3ae 100644
--- a/core/java/android/view/ViewStub.java
+++ b/core/java/android/view/ViewStub.java
@@ -212,7 +212,8 @@ public final class ViewStub extends View {
/**
* When visibility is set to {@link #VISIBLE} or {@link #INVISIBLE},
* {@link #inflate()} is invoked and this StubbedView is replaced in its parent
- * by the inflated layout resource.
+ * by the inflated layout resource. After that calls to this function are passed
+ * through to the inflated view.
*
* @param visibility One of {@link #VISIBLE}, {@link #INVISIBLE}, or {@link #GONE}.
*