Merge "Add getText to Partner.java" into oc-mr1-dev
This commit is contained in:
commit
81f18acfda
|
@ -26,6 +26,9 @@ import android.content.res.Resources;
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
import android.os.Build.VERSION;
|
import android.os.Build.VERSION;
|
||||||
import android.os.Build.VERSION_CODES;
|
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.support.annotation.VisibleForTesting;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
|
@ -56,7 +59,7 @@ public class Partner {
|
||||||
*
|
*
|
||||||
* @see #getResourceEntry(android.content.Context, int)
|
* @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);
|
final ResourceEntry entry = getResourceEntry(context, id);
|
||||||
return entry.resources.getDrawable(entry.id);
|
return entry.resources.getDrawable(entry.id);
|
||||||
}
|
}
|
||||||
|
@ -67,11 +70,20 @@ public class Partner {
|
||||||
*
|
*
|
||||||
* @see #getResourceEntry(android.content.Context, int)
|
* @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);
|
final ResourceEntry entry = getResourceEntry(context, id);
|
||||||
return entry.resources.getString(entry.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
|
* 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
|
* the resource in the overlay package, and if not available, will return the one in the
|
||||||
|
@ -82,7 +94,7 @@ public class Partner {
|
||||||
* {@code entry.resources.getString(entry.id)}, or other methods available in
|
* {@code entry.resources.getString(entry.id)}, or other methods available in
|
||||||
* {@link android.content.res.Resources}.
|
* {@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);
|
final Partner partner = Partner.get(context);
|
||||||
if (partner != null) {
|
if (partner != null) {
|
||||||
final Resources ourResources = context.getResources();
|
final Resources ourResources = context.getResources();
|
||||||
|
|
Loading…
Reference in a new issue