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

am d4344ba9: Merge change 23415 into eclair

Browse Source 
Merge commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b' into eclair-plus-aosp

* commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b':
  Open some methods on PrefereneManager to allow others use the inflater.
This commit is contained in:
Owen Lin
2009-09-08 13:40:56 -07:00
committed by Android Git Automerger
parent 0dbc931754 d4344ba9ba
commit 00453ad22a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/preference/PreferenceManager.java
View File

@@ -134,7 +134,10 @@ public class PreferenceManager {
private OnPreferenceTreeClickListener mOnPreferenceTreeClickListener; private OnPreferenceTreeClickListener mOnPreferenceTreeClickListener;
PreferenceManager(Activity activity, int firstRequestCode) { /**
* @hide
*/
public PreferenceManager(Activity activity, int firstRequestCode) {
mActivity = activity; mActivity = activity;
mNextRequestCode = firstRequestCode; mNextRequestCode = firstRequestCode;
@@ -240,8 +243,9 @@ public class PreferenceManager {
* hierarchies into. * hierarchies into.
* @return The root hierarchy (if one was not provided, the new hierarchy's * @return The root hierarchy (if one was not provided, the new hierarchy's
* root). * root).
* @hide
*/ */
PreferenceScreen inflateFromResource(Context context, int resId, public PreferenceScreen inflateFromResource(Context context, int resId,
PreferenceScreen rootPreferences) { PreferenceScreen rootPreferences) {
// Block commits // Block commits
setNoCommit(true); setNoCommit(true);