diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-02-18 19:23:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-18 19:24:01 +0000 |
| commit | a42d2eaf2d6b3cb6072e99b4904b76c8cc263cf3 (patch) | |
| tree | a8f93f9b6c9727807af4749b7a2bcad51e360efd /core/java/android/preference/PreferenceManager.java | |
| parent | fbf255125bbab3c8a2753a9001cc2cf373120a0f (diff) | |
| parent | 7b9c912f536925ac6ec43935d6e97506851b33d6 (diff) | |
| download | frameworks_base-a42d2eaf2d6b3cb6072e99b4904b76c8cc263cf3.zip frameworks_base-a42d2eaf2d6b3cb6072e99b4904b76c8cc263cf3.tar.gz frameworks_base-a42d2eaf2d6b3cb6072e99b4904b76c8cc263cf3.tar.bz2 | |
Merge "Add @ResourceInt annotations on APIs"
Diffstat (limited to 'core/java/android/preference/PreferenceManager.java')
| -rw-r--r-- | core/java/android/preference/PreferenceManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/preference/PreferenceManager.java b/core/java/android/preference/PreferenceManager.java index 0a0e625..55ee77a 100644 --- a/core/java/android/preference/PreferenceManager.java +++ b/core/java/android/preference/PreferenceManager.java @@ -16,6 +16,7 @@ package android.preference; +import android.annotation.XmlRes; import android.app.Activity; import android.content.Context; import android.content.DialogInterface; @@ -263,7 +264,7 @@ public class PreferenceManager { * root). * @hide */ - public PreferenceScreen inflateFromResource(Context context, int resId, + public PreferenceScreen inflateFromResource(Context context, @XmlRes int resId, PreferenceScreen rootPreferences) { // Block commits setNoCommit(true); @@ -438,7 +439,7 @@ public class PreferenceManager { * and clear it followed by a call to this method with this * parameter set to true. */ - public static void setDefaultValues(Context context, int resId, boolean readAgain) { + public static void setDefaultValues(Context context, @XmlRes int resId, boolean readAgain) { // Use the default shared preferences name and mode setDefaultValues(context, getDefaultSharedPreferencesName(context), |