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

Commit 2aa403fe authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android (Google) Code Review
Browse files

Merge "LayoutLib: Fix android:dependency for preferences." into mnc-ub-dev

parents 073a1624 2f01cf2e

tools/layoutlib/bridge/src/android/preference/Preference_Delegate.java

+2 −5
Original line number Original line Diff line number Diff line
@@ -29,9 +29,6 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.ViewGroup;

import android.widget.ListView;

import android.widget.ListView;





import java.util.HashMap;

import java.util.Map;



/**

/**

 * Delegate that provides implementation for native methods in {@link Preference}

 * Delegate that provides implementation for native methods in {@link Preference}

 * <p/>

 * <p/>
@@ -59,9 +56,9 @@ public class Preference_Delegate { 
     */

     */

    public static View inflatePreference(Context context, XmlPullParser parser, ViewGroup root) {

    public static View inflatePreference(Context context, XmlPullParser parser, ViewGroup root) {

        PreferenceManager pm = new PreferenceManager(context);

        PreferenceManager pm = new PreferenceManager(context);

        PreferenceScreen ps = pm.getPreferenceScreen();

        PreferenceInflater inflater = new BridgePreferenceInflater(context, pm);

        PreferenceInflater inflater = new BridgePreferenceInflater(context, pm);

        ps = (PreferenceScreen) inflater.inflate(parser, ps, true);

        PreferenceScreen ps = (PreferenceScreen) inflater.inflate(parser, null, true);

        pm.setPreferences(ps);

        ListView preferenceView = createContainerView(context, root);

        ListView preferenceView = createContainerView(context, root);

        ps.bind(preferenceView);

        ps.bind(preferenceView);

        return preferenceView;

        return preferenceView;