PeterCxy/SetupWizardLibrary
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add getText to Partner.java

Browse source 
Test: Existing tests pass
Bug: 64547057
Change-Id: Ie98297d50a545952e861f79fba9c680550c64d29
This commit is contained in:
Maurice Lam 2017-08-17 20:47:22 -07:00
parent 0860be3a37
commit cb38f9b86c
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
library/main/src/com/android/setupwizardlib/util/Partner.java
View file

@ -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,11 +70,20 @@ 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
@ -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();