diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-08-13 13:42:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-13 13:42:56 -0700 |
| commit | 24bb2a708d30ed9e37b743cb059efd5a58b90e28 (patch) | |
| tree | 70ded74ec8199eff3d987af79eca802b2bdb387b /core | |
| parent | 00146321f80ef319356f4e55ab7ab284576d6101 (diff) | |
| parent | 52a50782d52d0ad2444d08550e4318421e6a15ab (diff) | |
| download | frameworks_base-24bb2a708d30ed9e37b743cb059efd5a58b90e28.zip frameworks_base-24bb2a708d30ed9e37b743cb059efd5a58b90e28.tar.gz frameworks_base-24bb2a708d30ed9e37b743cb059efd5a58b90e28.tar.bz2 | |
Merge "Make the doc for PreferenceScreen aware of PreferenceFragment."
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/preference/PreferenceScreen.java | 3 |
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}. |