| Index: remoting/android/java/src/org/chromium/chromoting/ChromotingUtil.java
|
| diff --git a/remoting/android/java/src/org/chromium/chromoting/ChromotingUtil.java b/remoting/android/java/src/org/chromium/chromoting/ChromotingUtil.java
|
| index 3d2bb492ca91e424ded496cee4670be547076b5b..3c7796d6fc4840860f79f9505650ab934c6dfb35 100644
|
| --- a/remoting/android/java/src/org/chromium/chromoting/ChromotingUtil.java
|
| +++ b/remoting/android/java/src/org/chromium/chromoting/ChromotingUtil.java
|
| @@ -11,11 +11,11 @@ import android.content.res.Resources;
|
| import android.graphics.PorterDuff;
|
| import android.graphics.drawable.Drawable;
|
| import android.net.Uri;
|
| +import android.support.v4.content.ContextCompat;
|
| import android.util.TypedValue;
|
| import android.view.Menu;
|
| import android.view.MenuItem;
|
|
|
| -import org.chromium.base.ApiCompatibilityUtils;
|
| import org.chromium.base.Log;
|
|
|
| /** Utility methods for chromoting code. */
|
| @@ -63,7 +63,7 @@ public abstract class ChromotingUtil {
|
|
|
| if (typedValue.resourceId != 0) {
|
| // Attribute is a resource.
|
| - return ApiCompatibilityUtils.getColor(context.getResources(), typedValue.resourceId);
|
| + return ContextCompat.getColor(context, typedValue.resourceId);
|
| } else if (typedValue.type >= TypedValue.TYPE_FIRST_COLOR_INT
|
| && typedValue.type <= TypedValue.TYPE_LAST_COLOR_INT) {
|
| // Attribute is a raw color value.
|
|
|