Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Deepanshu Gupta
2015-10-09 21:58:05 +00:00
committed by Android (Google) Code Review
parent 073a162491 2f01cf2ea6
commit 2aa403fe0c
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/layoutlib/bridge/src/android/preference/Preference_Delegate.java
View File

@@ -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;