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

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

Browse Source 
* commit '56d9696bb717ab0c7deebf4c84b0ff2094bd6cff':
  Expose PreferenceManager constructor / Preference#performClick
This commit is contained in:
Justin Koh
2012-10-29 13:37:17 -07:00
committed by Android Git Automerger
parent 46a0ec73b6 56d9696bb7
commit e8d85f6d1f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/preference/Preference.java
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;

5
core/java/android/preference/PreferenceManager.java
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;