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

Commit b5b183d5 authored by Justin Koh's avatar Justin Koh Committed by Android Git Automerger
Browse files

am e8d85f6d: am 56d9696b: Merge "Expose PreferenceManager constructor /... 

am e8d85f6d: am 56d9696b: Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev

* commit 'e8d85f6d':
  Expose PreferenceManager constructor / Preference#performClick
parents 266ca723 e8d85f6d

core/java/android/preference/Preference.java

+2 −1
Original line number Diff line number Diff line
@@ -939,8 +939,9 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis 
     * @param preferenceScreen A {@link PreferenceScreen} whose hierarchy click

     *            listener should be called in the proper order (between other

     *            processing). May be null.

     * @hide

     */

    void performClick(PreferenceScreen preferenceScreen) {

    public void performClick(PreferenceScreen preferenceScreen) {

        

        if (!isEnabled()) {

            return;

core/java/android/preference/PreferenceManager.java

+4 −1
Original line number Diff line number Diff line
@@ -138,7 +138,10 @@ public class PreferenceManager { 
    

    private OnPreferenceTreeClickListener mOnPreferenceTreeClickListener;

    

    PreferenceManager(Activity activity, int firstRequestCode) {

    /**

     * @hide

     */

    public PreferenceManager(Activity activity, int firstRequestCode) {

        mActivity = activity;

        mNextRequestCode = firstRequestCode;