Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24bb2a70 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android (Google) Code Review
Browse files

Merge "Make the doc for PreferenceScreen aware of PreferenceFragment."

parents 00146321 52a50782

core/java/android/preference/PreferenceScreen.java

+2 −1
Original line number Diff line number Diff line
@@ -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}.