Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev

This commit is contained in:
Justin Koh
2012-10-29 13:32:11 -07:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 2 deletions

View File

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

View File

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