diff options
author | Maurice Lam <yukl@google.com> | 2017-08-21 18:27:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-21 18:27:13 +0000 |
commit | 43140832d2721bdc033071ff115bdcb66eebfded (patch) | |
tree | dcc7d607f4b3eb6539e3f487fd9f0b7b49adc161 /library/main/src/com/android/setupwizardlib/util/Partner.java | |
parent | 7863532791419261a12694698c181317014f1245 (diff) | |
parent | 547275a114cf01acae1bb77ffc41bed109cb5b58 (diff) | |
download | setupwizard-43140832d2721bdc033071ff115bdcb66eebfded.tar.gz |
Merge "Add getText to Partner.java" into oc-mr1-dev am: 81f18acfda
am: 547275a114
Change-Id: If7c36a54b2a46a2b5fde7935ad8c676f4b016485
Diffstat (limited to 'library/main/src/com/android/setupwizardlib/util/Partner.java')
-rw-r--r-- | library/main/src/com/android/setupwizardlib/util/Partner.java | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/library/main/src/com/android/setupwizardlib/util/Partner.java b/library/main/src/com/android/setupwizardlib/util/Partner.java index d6e4919..67f5546 100644 --- a/library/main/src/com/android/setupwizardlib/util/Partner.java +++ b/library/main/src/com/android/setupwizardlib/util/Partner.java @@ -26,6 +26,9 @@ import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; +import android.support.annotation.AnyRes; +import android.support.annotation.DrawableRes; +import android.support.annotation.StringRes; import android.support.annotation.VisibleForTesting; import android.util.Log; @@ -56,7 +59,7 @@ public class Partner { * * @see #getResourceEntry(android.content.Context, int) */ - public static Drawable getDrawable(Context context, int id) { + public static Drawable getDrawable(Context context, @DrawableRes int id) { final ResourceEntry entry = getResourceEntry(context, id); return entry.resources.getDrawable(entry.id); } @@ -67,12 +70,21 @@ public class Partner { * * @see #getResourceEntry(android.content.Context, int) */ - public static String getString(Context context, int id) { + public static String getString(Context context, @StringRes int id) { final ResourceEntry entry = getResourceEntry(context, id); return entry.resources.getString(entry.id); } /** + * Convenience method to get a CharSequence from partner overlay, or if not available, the text + * from the original context. + */ + public static CharSequence getText(Context context, @StringRes int id) { + final ResourceEntry entry = getResourceEntry(context, id); + return entry.resources.getText(id); + } + + /** * Find an entry of resource in the overlay package provided by partners. It will first look for * the resource in the overlay package, and if not available, will return the one in the * original context. @@ -82,7 +94,7 @@ public class Partner { * {@code entry.resources.getString(entry.id)}, or other methods available in * {@link android.content.res.Resources}. */ - public static ResourceEntry getResourceEntry(Context context, int id) { + public static ResourceEntry getResourceEntry(Context context, @AnyRes int id) { final Partner partner = Partner.get(context); if (partner != null) { final Resources ourResources = context.getResources(); |