diff options
| author | Scott Main <smain@google.com> | 2012-07-26 22:34:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-26 22:34:55 -0700 |
| commit | 527d14dc3c2fd72f1cdfaaa7e249456778fe93e4 (patch) | |
| tree | 50b1700a66ceb165581d151e0213b6d98420e4bf | |
| parent | ada1f638b67f47f1cfc88a89c150c2383fefcfff (diff) | |
| parent | 587616a670cfa4dc532e30643052b428cd376138 (diff) | |
| download | frameworks_base-527d14dc3c2fd72f1cdfaaa7e249456778fe93e4.zip frameworks_base-527d14dc3c2fd72f1cdfaaa7e249456778fe93e4.tar.gz frameworks_base-527d14dc3c2fd72f1cdfaaa7e249456778fe93e4.tar.bz2 | |
am 587616a6: am cdd0c59a: docs: add links to new Settings dev guide
* commit '587616a670cfa4dc532e30643052b428cd376138':
docs: add links to new Settings dev guide
6 files changed, 42 insertions, 0 deletions
diff --git a/core/java/android/preference/Preference.java b/core/java/android/preference/Preference.java index 8df4339..336960e 100644 --- a/core/java/android/preference/Preference.java +++ b/core/java/android/preference/Preference.java @@ -55,6 +55,13 @@ import java.util.Set; * {@link SharedPreferences}. It is up to the subclass to decide how to store * the value. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For information about building a settings UI with Preferences, + * read the <a href="{@docRoot}guide/topics/ui/settings.html">Settings</a> + * guide.</p> + * </div> + * * @attr ref android.R.styleable#Preference_icon * @attr ref android.R.styleable#Preference_key * @attr ref android.R.styleable#Preference_title diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index 140bff0..9bfa8c0 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -84,6 +84,13 @@ import java.util.List; * items. Doing this implicitly switches the class into its new "headers * + fragments" mode rather than the old style of just showing a single * preferences list. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For information about using {@code PreferenceActivity}, + * read the <a href="{@docRoot}guide/topics/ui/settings.html">Settings</a> + * guide.</p> + * </div> * * <a name="SampleCode"></a> * <h3>Sample Code</h3> diff --git a/core/java/android/preference/PreferenceCategory.java b/core/java/android/preference/PreferenceCategory.java index 237c5ce..d8af324 100644 --- a/core/java/android/preference/PreferenceCategory.java +++ b/core/java/android/preference/PreferenceCategory.java @@ -24,6 +24,13 @@ import android.util.AttributeSet; /** * Used to group {@link Preference} objects * and provide a disabled title above the group. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For information about building a settings UI with Preferences, + * read the <a href="{@docRoot}guide/topics/ui/settings.html">Settings</a> + * guide.</p> + * </div> */ public class PreferenceCategory extends PreferenceGroup { private static final String TAG = "PreferenceCategory"; diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java index bdd858b..11d8878 100644 --- a/core/java/android/preference/PreferenceFragment.java +++ b/core/java/android/preference/PreferenceFragment.java @@ -74,6 +74,13 @@ import android.widget.ListView; * As a convenience, this fragment implements a click listener for any * preference in the current hierarchy, see * {@link #onPreferenceTreeClick(PreferenceScreen, Preference)}. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For information about using {@code PreferenceFragment}, + * read the <a href="{@docRoot}guide/topics/ui/settings.html">Settings</a> + * guide.</p> + * </div> * * <a name="SampleCode"></a> * <h3>Sample Code</h3> diff --git a/core/java/android/preference/PreferenceGroup.java b/core/java/android/preference/PreferenceGroup.java index d008fd6..f33a6be 100644 --- a/core/java/android/preference/PreferenceGroup.java +++ b/core/java/android/preference/PreferenceGroup.java @@ -33,6 +33,13 @@ import android.util.AttributeSet; * {@link Preference} objects. It is a base class for Preference objects that are * parents, such as {@link PreferenceCategory} and {@link PreferenceScreen}. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For information about building a settings UI with Preferences, + * read the <a href="{@docRoot}guide/topics/ui/settings.html">Settings</a> + * guide.</p> + * </div> + * * @attr ref android.R.styleable#PreferenceGroup_orderingFromXml */ public abstract class PreferenceGroup extends Preference implements GenericInflater.Parent<Preference> { diff --git a/core/java/android/preference/PreferenceScreen.java b/core/java/android/preference/PreferenceScreen.java index c17111a..db80676 100644 --- a/core/java/android/preference/PreferenceScreen.java +++ b/core/java/android/preference/PreferenceScreen.java @@ -75,6 +75,13 @@ import android.widget.ListView; * clicked will show another screen of preferences such as "Prefer WiFi" (and * the other preferences that are children of the "second_preferencescreen" tag). * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For information about building a settings UI with Preferences, + * read the <a href="{@docRoot}guide/topics/ui/settings.html">Settings</a> + * guide.</p> + * </div> + * * @see PreferenceCategory */ public final class PreferenceScreen extends PreferenceGroup implements AdapterView.OnItemClickListener, |