Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Switch colors" into mnc-ub-dev

Browse Source 
am: 71093465ab

* commit '71093465abbdf887c705b40fb0cb8a2919894c4b':
  Fix Switch colors
This commit is contained in:
Deepanshu Gupta
2015-11-05 17:24:38 +00:00
committed by android-build-merger
parent f7db8e407b 71093465ab
commit ceb2b54909
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/PorterDuffUtility.java
View File

@@ -21,6 +21,7 @@ import com.android.layoutlib.bridge.Bridge;
import android.graphics.BlendComposite; import android.graphics.BlendComposite;
import android.graphics.BlendComposite.BlendingMode; import android.graphics.BlendComposite.BlendingMode;
import android.graphics.PorterDuff;
import android.graphics.PorterDuff.Mode; import android.graphics.PorterDuff.Mode;
import android.graphics.PorterDuffColorFilter_Delegate; import android.graphics.PorterDuffColorFilter_Delegate;
import android.graphics.PorterDuffXfermode_Delegate; import android.graphics.PorterDuffXfermode_Delegate;
@@ -34,6 +35,8 @@ import java.awt.Composite;
*/ */
public final class PorterDuffUtility { public final class PorterDuffUtility {
private static final int MODES_COUNT = Mode.values().length;
// Make the class non-instantiable. // Make the class non-instantiable.
private PorterDuffUtility() { private PorterDuffUtility() {
} }
@@ -43,12 +46,11 @@ public final class PorterDuffUtility {
* {@link Mode#SRC_OVER} for invalid modes. * {@link Mode#SRC_OVER} for invalid modes.
*/ */
public static Mode getPorterDuffMode(int porterDuffMode) { public static Mode getPorterDuffMode(int porterDuffMode) {
Mode[] values = Mode.values(); if (porterDuffMode >= 0 && porterDuffMode < MODES_COUNT) {
if (porterDuffMode >= 0 && porterDuffMode < values.length) { return PorterDuff.intToMode(porterDuffMode);
return values[porterDuffMode];
} }
Bridge.getLog().error(LayoutLog.TAG_BROKEN, Bridge.getLog().error(LayoutLog.TAG_BROKEN,
String.format("Unknown PorterDuff.Mode: %1$d", porterDuffMode), null /*data*/); String.format("Unknown PorterDuff.Mode: %1$d", porterDuffMode), null);
assert false; assert false;
return Mode.SRC_OVER; return Mode.SRC_OVER;
} }