summaryrefslogtreecommitdiffstats
path: root/core/java/android/preference
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2010-08-13 13:20:04 -0700
committerDaisuke Miyakawa <dmiyakawa@google.com>2010-08-13 13:20:04 -0700
commit52a50782d52d0ad2444d08550e4318421e6a15ab (patch)
treeabc15d892158a83e4e3f31913a4b7e022dc26ca1 /core/java/android/preference
parentaba188523cd6ce7f5385fd2c10fa72c17ac80b88 (diff)
downloadframeworks_base-52a50782d52d0ad2444d08550e4318421e6a15ab.zip
frameworks_base-52a50782d52d0ad2444d08550e4318421e6a15ab.tar.gz
frameworks_base-52a50782d52d0ad2444d08550e4318421e6a15ab.tar.bz2
Make the doc for PreferenceScreen aware of PreferenceFragment.
This class has existed from before, so the doc does not mention PreferenceFragment but only PreferenceActivity, while actually the class can be used via PreferenceFragment. Change-Id: Ie3756f7ff260cff829eff31a6ba99260c681bc2d
Diffstat (limited to 'core/java/android/preference')
-rw-r--r--core/java/android/preference/PreferenceScreen.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/preference/PreferenceScreen.java b/core/java/android/preference/PreferenceScreen.java
index f34f4a3..c7f8ab2 100644
--- a/core/java/android/preference/PreferenceScreen.java
+++ b/core/java/android/preference/PreferenceScreen.java
@@ -91,7 +91,8 @@ public final class PreferenceScreen extends PreferenceGroup implements AdapterVi
/**
* Returns an adapter that can be attached to a {@link PreferenceActivity}
- * to show the preferences contained in this {@link PreferenceScreen}.
+ * or {@link PreferenceFragment} to show the preferences contained in this
+ * {@link PreferenceScreen}.
* <p>
* This {@link PreferenceScreen} will NOT appear in the returned adapter, instead
* it appears in the hierarchy above this {@link PreferenceScreen}.