Merge "Content and settings shell commands passing invalid calling package."
diff --git a/api/current.txt b/api/current.txt
index a9cd058..00afda2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5783,6 +5783,7 @@
method public java.lang.String getPackageName();
method public long getTimeStamp();
field public static final int CONFIGURATION_CHANGE = 5; // 0x5
+ field public static final int INTERACTION = 6; // 0x6
field public static final int MOVE_TO_BACKGROUND = 2; // 0x2
field public static final int MOVE_TO_FOREGROUND = 1; // 0x1
field public static final int NONE = 0; // 0x0
diff --git a/api/system-current.txt b/api/system-current.txt
index 52586ed..0a680003 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5962,6 +5962,7 @@
method public java.lang.String getPackageName();
method public long getTimeStamp();
field public static final int CONFIGURATION_CHANGE = 5; // 0x5
+ field public static final int INTERACTION = 6; // 0x6
field public static final int MOVE_TO_BACKGROUND = 2; // 0x2
field public static final int MOVE_TO_FOREGROUND = 1; // 0x1
field public static final int NONE = 0; // 0x0
diff --git a/core/java/android/app/usage/UsageEvents.java b/core/java/android/app/usage/UsageEvents.java
index 3cf3c95..58279d7 100644
--- a/core/java/android/app/usage/UsageEvents.java
+++ b/core/java/android/app/usage/UsageEvents.java
@@ -68,6 +68,11 @@
public static final int CONFIGURATION_CHANGE = 5;
/**
+ * An event type denoting that a package was interacted with in some way.
+ */
+ public static final int INTERACTION = 6;
+
+ /**
* {@hide}
*/
public String mPackage;
diff --git a/core/java/android/app/usage/UsageStatsManagerInternal.java b/core/java/android/app/usage/UsageStatsManagerInternal.java
index 083a48a..0122069 100644
--- a/core/java/android/app/usage/UsageStatsManagerInternal.java
+++ b/core/java/android/app/usage/UsageStatsManagerInternal.java
@@ -37,6 +37,16 @@
public abstract void reportEvent(ComponentName component, int userId, int eventType);
/**
+ * Reports an event to the UsageStatsManager.
+ *
+ * @param packageName The package for which this event occurred.
+ * @param userId The user id to which the component belongs to.
+ * @param eventType The event that occurred. Valid values can be found at
+ * {@link UsageEvents}
+ */
+ public abstract void reportEvent(String packageName, int userId, int eventType);
+
+ /**
* Reports a configuration change to the UsageStatsManager.
*
* @param config The new device configuration.
diff --git a/core/java/android/content/UndoManager.java b/core/java/android/content/UndoManager.java
index 559b01c..1d5ed8a 100644
--- a/core/java/android/content/UndoManager.java
+++ b/core/java/android/content/UndoManager.java
@@ -162,6 +162,7 @@
owner.mSavedIdx = mNextSavedIdx;
out.writeInt(owner.mSavedIdx);
out.writeString(owner.mTag);
+ out.writeInt(owner.mOpCount);
mNextSavedIdx++;
}
}
@@ -200,7 +201,9 @@
UndoOwner owner = mStateOwners[idx];
if (owner == null) {
String tag = in.readString();
+ int opCount = in.readInt();
owner = new UndoOwner(tag, this);
+ owner.mOpCount = opCount;
mStateOwners[idx] = owner;
mOwners.put(tag, owner);
}
diff --git a/core/java/android/content/UndoOwner.java b/core/java/android/content/UndoOwner.java
index 9106588..fd257ab 100644
--- a/core/java/android/content/UndoOwner.java
+++ b/core/java/android/content/UndoOwner.java
@@ -61,4 +61,15 @@
public Object getData() {
return mData;
}
+
+ @Override
+ public String toString() {
+ return "UndoOwner:[mTag=" + mTag +
+ " mManager=" + mManager +
+ " mData=" + mData +
+ " mData=" + mData +
+ " mOpCount=" + mOpCount +
+ " mStateSeq=" + mStateSeq +
+ " mSavedIdx=" + mSavedIdx + "]";
+ }
}
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java
index a929f3d..399f4c5 100644
--- a/core/java/android/widget/PopupWindow.java
+++ b/core/java/android/widget/PopupWindow.java
@@ -160,14 +160,14 @@
private final EpicenterCallback mEpicenterCallback = new EpicenterCallback() {
@Override
public Rect onGetEpicenter(Transition transition) {
- final View anchor = mAnchor.get();
+ final View anchor = mAnchor != null ? mAnchor.get() : null;
final View decor = mDecorView;
if (anchor == null || decor == null) {
return null;
}
final Rect anchorBounds = mAnchorBounds;
- final int[] anchorLocation = mAnchor.get().getLocationOnScreen();
+ final int[] anchorLocation = anchor.getLocationOnScreen();
final int[] popupLocation = mDecorView.getLocationOnScreen();
// Compute the position of the anchor relative to the popup.
@@ -1632,8 +1632,14 @@
* view hierarchy, if necessary.
*/
private void dismissImmediate(View contentView) {
+ if (mDecorView == null || mBackgroundView == null) {
+ throw new RuntimeException("Popup window already dismissed");
+ }
+
try {
- mWindowManager.removeViewImmediate(mDecorView);
+ if (mDecorView.isAttachedToWindow()) {
+ mWindowManager.removeViewImmediate(mDecorView);
+ }
} finally {
mDecorView.removeView(mBackgroundView);
mDecorView = null;
diff --git a/rs/java/android/renderscript/AllocationAdapter.java b/rs/java/android/renderscript/AllocationAdapter.java
index 9e28f7c..183726f 100644
--- a/rs/java/android/renderscript/AllocationAdapter.java
+++ b/rs/java/android/renderscript/AllocationAdapter.java
@@ -72,17 +72,19 @@
private void updateOffsets() {
int a1 = 0, a2 = 0, a3 = 0, a4 = 0;
- if (mSelectedArray.length > 0) {
- a1 = mSelectedArray[0];
- }
- if (mSelectedArray.length > 1) {
- a2 = mSelectedArray[2];
- }
- if (mSelectedArray.length > 2) {
- a3 = mSelectedArray[2];
- }
- if (mSelectedArray.length > 3) {
- a4 = mSelectedArray[3];
+ if (mSelectedArray != null) {
+ if (mSelectedArray.length > 0) {
+ a1 = mSelectedArray[0];
+ }
+ if (mSelectedArray.length > 1) {
+ a2 = mSelectedArray[2];
+ }
+ if (mSelectedArray.length > 2) {
+ a3 = mSelectedArray[2];
+ }
+ if (mSelectedArray.length > 3) {
+ a4 = mSelectedArray[3];
+ }
}
mRS.nAllocationAdapterOffset(getID(mRS), mSelectedX, mSelectedY, mSelectedZ,
mSelectedLOD, mSelectedFace.mID, a1, a2, a3, a4);
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index 376ef2a..d153233 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -259,7 +259,7 @@
+ newDefaultSubIdObj + " newDefaultPhoneId=" + newDefaultPhoneId);
}
- if(validatePhoneId(newDefaultPhoneId) && (newDefaultSubIdObj.equals(mDefaultSubId)
+ if(validatePhoneId(newDefaultPhoneId) && (!newDefaultSubIdObj.equals(mDefaultSubId)
|| (newDefaultPhoneId != mDefaultPhoneId))) {
mHandler.sendMessage(mHandler.obtainMessage(MSG_UPDATE_DEFAULT_SUB,
newDefaultPhoneId, 0, newDefaultSubIdObj));
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 80145b1..018d77a 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -5347,8 +5347,8 @@
//==========================================================================================
// Hdmi Cec system audio mode.
- // If Hdmi Cec's system audio mode is on, audio service should notify volume change
- // to HdmiControlService so that audio recevier can handle volume change.
+ // If Hdmi Cec's system audio mode is on, audio service should send the volume change
+ // to HdmiControlService so that the audio receiver can handle it.
//==========================================================================================
private class MyDisplayStatusCallback implements HdmiPlaybackClient.DisplayStatusCallback {
diff --git a/services/usage/java/com/android/server/usage/IntervalStats.java b/services/usage/java/com/android/server/usage/IntervalStats.java
index 5f639ab..869d6e1 100644
--- a/services/usage/java/com/android/server/usage/IntervalStats.java
+++ b/services/usage/java/com/android/server/usage/IntervalStats.java
@@ -81,6 +81,17 @@
return event;
}
+ private boolean isStatefulEvent(int eventType) {
+ switch (eventType) {
+ case UsageEvents.Event.MOVE_TO_FOREGROUND:
+ case UsageEvents.Event.MOVE_TO_BACKGROUND:
+ case UsageEvents.Event.END_OF_DAY:
+ case UsageEvents.Event.CONTINUE_PREVIOUS_DAY:
+ return true;
+ }
+ return false;
+ }
+
void update(String packageName, long timeStamp, int eventType) {
UsageStats usageStats = getOrCreateUsageStats(packageName);
@@ -93,7 +104,11 @@
usageStats.mTotalTimeInForeground += timeStamp - usageStats.mLastTimeUsed;
}
}
- usageStats.mLastEvent = eventType;
+
+ if (isStatefulEvent(eventType)) {
+ usageStats.mLastEvent = eventType;
+ }
+
usageStats.mLastTimeUsed = timeStamp;
usageStats.mEndTimeStamp = timeStamp;
diff --git a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java
index 26ced03..235567c 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java
@@ -378,26 +378,27 @@
}
}
- try {
- IntervalStats stats = new IntervalStats();
- ArrayList<T> results = new ArrayList<>();
- for (int i = startIndex; i <= endIndex; i++) {
- final AtomicFile f = intervalStats.valueAt(i);
+ final IntervalStats stats = new IntervalStats();
+ final ArrayList<T> results = new ArrayList<>();
+ for (int i = startIndex; i <= endIndex; i++) {
+ final AtomicFile f = intervalStats.valueAt(i);
- if (DEBUG) {
- Slog.d(TAG, "Reading stat file " + f.getBaseFile().getAbsolutePath());
- }
+ if (DEBUG) {
+ Slog.d(TAG, "Reading stat file " + f.getBaseFile().getAbsolutePath());
+ }
+ try {
UsageStatsXml.read(f, stats);
if (beginTime < stats.endTime) {
combiner.combine(stats, false, results);
}
+ } catch (IOException e) {
+ Slog.e(TAG, "Failed to read usage stats file", e);
+ // We continue so that we return results that are not
+ // corrupt.
}
- return results;
- } catch (IOException e) {
- Slog.e(TAG, "Failed to read usage stats file", e);
- return null;
}
+ return results;
}
}
@@ -450,6 +451,10 @@
mCal.addDays(-7);
pruneFilesOlderThan(mIntervalDirs[UsageStatsManager.INTERVAL_DAILY],
mCal.getTimeInMillis());
+
+ // We must re-index our file list or we will be trying to read
+ // deleted files.
+ indexFilesLocked();
}
}
diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java
index 485b2a2..5eefe6a 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsService.java
@@ -488,6 +488,23 @@
}
@Override
+ public void reportEvent(String packageName, int userId, int eventType) {
+ if (packageName == null) {
+ Slog.w(TAG, "Event reported without a package name");
+ return;
+ }
+
+ UsageEvents.Event event = new UsageEvents.Event();
+ event.mPackage = packageName;
+
+ // This will later be converted to system time.
+ event.mTimeStamp = SystemClock.elapsedRealtime();
+
+ event.mEventType = eventType;
+ mHandler.obtainMessage(MSG_REPORT_EVENT, userId, 0, event).sendToTarget();
+ }
+
+ @Override
public void reportConfigurationChange(Configuration config, int userId) {
if (config == null) {
Slog.w(TAG, "Configuration event reported with a null config");
diff --git a/services/usage/java/com/android/server/usage/UserUsageStatsService.java b/services/usage/java/com/android/server/usage/UserUsageStatsService.java
index 6596781..75fa030 100644
--- a/services/usage/java/com/android/server/usage/UserUsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UserUsageStatsService.java
@@ -570,6 +570,8 @@
return "CONTINUE_PREVIOUS_DAY";
case UsageEvents.Event.CONFIGURATION_CHANGE:
return "CONFIGURATION_CHANGE";
+ case UsageEvents.Event.INTERACTION:
+ return "INTERACTION";
default:
return "UNKNOWN";
}
diff --git a/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageLogActivity.java b/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageLogActivity.java
index d9a3b61..8e6daea 100644
--- a/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageLogActivity.java
+++ b/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageLogActivity.java
@@ -166,6 +166,9 @@
case UsageEvents.Event.CONFIGURATION_CHANGE:
return "Config change";
+ case UsageEvents.Event.INTERACTION:
+ return "Interaction";
+
default:
return "Unknown: " + eventType;
}
diff --git a/tools/layoutlib/.idea/codeStyleSettings.xml b/tools/layoutlib/.idea/codeStyleSettings.xml
index 1f08f09..89f7b34 100644
--- a/tools/layoutlib/.idea/codeStyleSettings.xml
+++ b/tools/layoutlib/.idea/codeStyleSettings.xml
@@ -40,7 +40,6 @@
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
<codeStyleSettings language="JAVA">
- <option name="INDENT_CASE_FROM_SWITCH" value="false" />
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="1" />
diff --git a/tools/layoutlib/bridge/src/android/content/res/BridgeResources.java b/tools/layoutlib/bridge/src/android/content/res/BridgeResources.java
index 66126af..96ca250 100644
--- a/tools/layoutlib/bridge/src/android/content/res/BridgeResources.java
+++ b/tools/layoutlib/bridge/src/android/content/res/BridgeResources.java
@@ -178,11 +178,21 @@
Pair<String, ResourceValue> value = getResourceValue(id, mPlatformResourceFlag);
if (value != null) {
+ ResourceValue resourceValue = value.getSecond();
try {
- return ResourceHelper.getColor(value.getSecond().getValue());
+ return ResourceHelper.getColor(resourceValue.getValue());
} catch (NumberFormatException e) {
- Bridge.getLog().error(LayoutLog.TAG_RESOURCES_FORMAT, e.getMessage(), e,
- null /*data*/);
+ // Check if the value passed is a file. If it is, mostly likely, user is referencing
+ // a color state list from a place where they should reference only a pure color.
+ String message;
+ if (new File(resourceValue.getValue()).isFile()) {
+ String resource = (resourceValue.isFramework() ? "@android:" : "@") + "color/"
+ + resourceValue.getName();
+ message = "Hexadecimal color expected, found Color State List for " + resource;
+ } else {
+ message = e.getMessage();
+ }
+ Bridge.getLog().error(LayoutLog.TAG_RESOURCES_FORMAT, message, e, null);
return 0;
}
}
diff --git a/tools/layoutlib/bridge/src/android/graphics/BlendComposite.java b/tools/layoutlib/bridge/src/android/graphics/BlendComposite.java
index a3ec2cc..b9928fc 100644
--- a/tools/layoutlib/bridge/src/android/graphics/BlendComposite.java
+++ b/tools/layoutlib/bridge/src/android/graphics/BlendComposite.java
@@ -29,75 +29,38 @@
* The class is adapted from a demo tool for Blending Modes written by
* Romain Guy (romainguy@android.com). The tool is available at
* http://www.curious-creature.org/2006/09/20/new-blendings-modes-for-java2d/
+ *
+ * This class has been adapted for applying color filters. When applying color filters, the src
+ * image should not extend beyond the dest image, but in our implementation of the filters, it does.
+ * To compensate for the effect, we recompute the alpha value of the src image before applying
+ * the color filter as it should have been applied.
*/
public final class BlendComposite implements Composite {
public enum BlendingMode {
- NORMAL,
- AVERAGE,
- MULTIPLY,
- SCREEN,
- DARKEN,
- LIGHTEN,
- OVERLAY,
- HARD_LIGHT,
- SOFT_LIGHT,
- DIFFERENCE,
- NEGATION,
- EXCLUSION,
- COLOR_DODGE,
- INVERSE_COLOR_DODGE,
- SOFT_DODGE,
- COLOR_BURN,
- INVERSE_COLOR_BURN,
- SOFT_BURN,
- REFLECT,
- GLOW,
- FREEZE,
- HEAT,
- ADD,
- SUBTRACT,
- STAMP,
- RED,
- GREEN,
- BLUE,
- HUE,
- SATURATION,
- COLOR,
- LUMINOSITY
+ MULTIPLY(Multiply),
+ SCREEN(Screen),
+ DARKEN(Darken),
+ LIGHTEN(Lighten),
+ OVERLAY(Overlay),
+ ADD(Add);
+
+ private BlendComposite mComposite;
+
+ BlendingMode(BlendComposite composite) {
+ mComposite = composite;
+ }
+
+ BlendComposite getBlendComposite() {
+ return mComposite;
+ }
}
- public static final BlendComposite Normal = new BlendComposite(BlendingMode.NORMAL);
- public static final BlendComposite Average = new BlendComposite(BlendingMode.AVERAGE);
public static final BlendComposite Multiply = new BlendComposite(BlendingMode.MULTIPLY);
public static final BlendComposite Screen = new BlendComposite(BlendingMode.SCREEN);
public static final BlendComposite Darken = new BlendComposite(BlendingMode.DARKEN);
public static final BlendComposite Lighten = new BlendComposite(BlendingMode.LIGHTEN);
public static final BlendComposite Overlay = new BlendComposite(BlendingMode.OVERLAY);
- public static final BlendComposite HardLight = new BlendComposite(BlendingMode.HARD_LIGHT);
- public static final BlendComposite SoftLight = new BlendComposite(BlendingMode.SOFT_LIGHT);
- public static final BlendComposite Difference = new BlendComposite(BlendingMode.DIFFERENCE);
- public static final BlendComposite Negation = new BlendComposite(BlendingMode.NEGATION);
- public static final BlendComposite Exclusion = new BlendComposite(BlendingMode.EXCLUSION);
- public static final BlendComposite ColorDodge = new BlendComposite(BlendingMode.COLOR_DODGE);
- public static final BlendComposite InverseColorDodge = new BlendComposite(BlendingMode.INVERSE_COLOR_DODGE);
- public static final BlendComposite SoftDodge = new BlendComposite(BlendingMode.SOFT_DODGE);
- public static final BlendComposite ColorBurn = new BlendComposite(BlendingMode.COLOR_BURN);
- public static final BlendComposite InverseColorBurn = new BlendComposite(BlendingMode.INVERSE_COLOR_BURN);
- public static final BlendComposite SoftBurn = new BlendComposite(BlendingMode.SOFT_BURN);
- public static final BlendComposite Reflect = new BlendComposite(BlendingMode.REFLECT);
- public static final BlendComposite Glow = new BlendComposite(BlendingMode.GLOW);
- public static final BlendComposite Freeze = new BlendComposite(BlendingMode.FREEZE);
- public static final BlendComposite Heat = new BlendComposite(BlendingMode.HEAT);
public static final BlendComposite Add = new BlendComposite(BlendingMode.ADD);
- public static final BlendComposite Subtract = new BlendComposite(BlendingMode.SUBTRACT);
- public static final BlendComposite Stamp = new BlendComposite(BlendingMode.STAMP);
- public static final BlendComposite Red = new BlendComposite(BlendingMode.RED);
- public static final BlendComposite Green = new BlendComposite(BlendingMode.GREEN);
- public static final BlendComposite Blue = new BlendComposite(BlendingMode.BLUE);
- public static final BlendComposite Hue = new BlendComposite(BlendingMode.HUE);
- public static final BlendComposite Saturation = new BlendComposite(BlendingMode.SATURATION);
- public static final BlendComposite Color = new BlendComposite(BlendingMode.COLOR);
- public static final BlendComposite Luminosity = new BlendComposite(BlendingMode.LUMINOSITY);
private float alpha;
private BlendingMode mode;
@@ -112,21 +75,16 @@
}
public static BlendComposite getInstance(BlendingMode mode) {
- return new BlendComposite(mode);
+ return mode.getBlendComposite();
}
public static BlendComposite getInstance(BlendingMode mode, float alpha) {
+ if (alpha > 0.9999f) {
+ return getInstance(mode);
+ }
return new BlendComposite(mode, alpha);
}
- public BlendComposite derive(BlendingMode mode) {
- return this.mode == mode ? this : new BlendComposite(mode, getAlpha());
- }
-
- public BlendComposite derive(float alpha) {
- return this.alpha == alpha ? this : new BlendComposite(getMode(), alpha);
- }
-
public float getAlpha() {
return alpha;
}
@@ -157,11 +115,7 @@
BlendComposite bc = (BlendComposite) obj;
- if (mode != bc.mode) {
- return false;
- }
-
- return alpha == bc.alpha;
+ return mode == bc.mode && alpha == bc.alpha;
}
public CompositeContext createContext(ColorModel srcColorModel,
@@ -220,6 +174,11 @@
dstPixel[2] = (pixel ) & 0xFF;
dstPixel[3] = (pixel >> 24) & 0xFF;
+ // ---- Modified from original ----
+ // recompute src pixel for transparency.
+ srcPixel[3] *= dstPixel[3] / 0xFF;
+ // ---- Modification ends ----
+
result = blender.blend(srcPixel, dstPixel, result);
// mixes the result with the opacity
@@ -246,123 +205,8 @@
private static abstract class Blender {
public abstract int[] blend(int[] src, int[] dst, int[] result);
- private static void RGBtoHSL(int r, int g, int b, float[] hsl) {
- float var_R = (r / 255f);
- float var_G = (g / 255f);
- float var_B = (b / 255f);
-
- float var_Min;
- float var_Max;
- float del_Max;
-
- if (var_R > var_G) {
- var_Min = var_G;
- var_Max = var_R;
- } else {
- var_Min = var_R;
- var_Max = var_G;
- }
- if (var_B > var_Max) {
- var_Max = var_B;
- }
- if (var_B < var_Min) {
- var_Min = var_B;
- }
-
- del_Max = var_Max - var_Min;
-
- float H, S, L;
- L = (var_Max + var_Min) / 2f;
-
- if (del_Max - 0.01f <= 0.0f) {
- H = 0;
- S = 0;
- } else {
- if (L < 0.5f) {
- S = del_Max / (var_Max + var_Min);
- } else {
- S = del_Max / (2 - var_Max - var_Min);
- }
-
- float del_R = (((var_Max - var_R) / 6f) + (del_Max / 2f)) / del_Max;
- float del_G = (((var_Max - var_G) / 6f) + (del_Max / 2f)) / del_Max;
- float del_B = (((var_Max - var_B) / 6f) + (del_Max / 2f)) / del_Max;
-
- if (var_R == var_Max) {
- H = del_B - del_G;
- } else if (var_G == var_Max) {
- H = (1 / 3f) + del_R - del_B;
- } else {
- H = (2 / 3f) + del_G - del_R;
- }
- if (H < 0) {
- H += 1;
- }
- if (H > 1) {
- H -= 1;
- }
- }
-
- hsl[0] = H;
- hsl[1] = S;
- hsl[2] = L;
- }
-
- private static void HSLtoRGB(float h, float s, float l, int[] rgb) {
- int R, G, B;
-
- if (s - 0.01f <= 0.0f) {
- R = (int) (l * 255.0f);
- G = (int) (l * 255.0f);
- B = (int) (l * 255.0f);
- } else {
- float var_1, var_2;
- if (l < 0.5f) {
- var_2 = l * (1 + s);
- } else {
- var_2 = (l + s) - (s * l);
- }
- var_1 = 2 * l - var_2;
-
- R = (int) (255.0f * hue2RGB(var_1, var_2, h + (1.0f / 3.0f)));
- G = (int) (255.0f * hue2RGB(var_1, var_2, h));
- B = (int) (255.0f * hue2RGB(var_1, var_2, h - (1.0f / 3.0f)));
- }
-
- rgb[0] = R;
- rgb[1] = G;
- rgb[2] = B;
- }
-
- private static float hue2RGB(float v1, float v2, float vH) {
- if (vH < 0.0f) {
- vH += 1.0f;
- }
- if (vH > 1.0f) {
- vH -= 1.0f;
- }
- if ((6.0f * vH) < 1.0f) {
- return (v1 + (v2 - v1) * 6.0f * vH);
- }
- if ((2.0f * vH) < 1.0f) {
- return (v2);
- }
- if ((3.0f * vH) < 2.0f) {
- return (v1 + (v2 - v1) * ((2.0f / 3.0f) - vH) * 6.0f);
- }
- return (v1);
- }
-
public static Blender getBlenderFor(BlendComposite composite) {
switch (composite.getMode()) {
- case NORMAL:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- System.arraycopy(src, 0, result, 0, 4);
- return result;
- }
- };
case ADD:
return new Blender() {
@Override
@@ -373,65 +217,6 @@
return result;
}
};
- case AVERAGE:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- for (int i = 0; i < 3; i++) {
- result[i] = (src[i] + dst[i]) >> 1;
- }
- result[3] = Math.min(255, src[3] + dst[3]);
- return result;
- }
- };
- case BLUE:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- System.arraycopy(dst, 0, result, 0, 3);
- result[3] = Math.min(255, src[3] + dst[3]);
- return result;
- }
- };
- case COLOR:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- float[] srcHSL = new float[3];
- RGBtoHSL(src[0], src[1], src[2], srcHSL);
- float[] dstHSL = new float[3];
- RGBtoHSL(dst[0], dst[1], dst[2], dstHSL);
-
- HSLtoRGB(srcHSL[0], srcHSL[1], dstHSL[2], result);
- result[3] = Math.min(255, src[3] + dst[3]);
-
- return result;
- }
- };
- case COLOR_BURN:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- for (int i = 0; i < 3; i++) {
- result[i] = src[i] == 0 ? 0 :
- Math.max(0, 255 - (((255 - dst[i]) << 8) / src[i]));
- }
- result[3] = Math.min(255, src[3] + dst[3]);
- return result;
- }
- };
- case COLOR_DODGE:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- for (int i = 0; i < 3; i++) {
- result[i] = src[i] == 255 ? 255 :
- Math.min((dst[i] << 8) / (255 - src[i]), 255);
- }
- result[3] = Math.min(255, src[3] + dst[3]);
- return result;
- }
- };
case DARKEN:
return new Blender() {
@Override
@@ -443,136 +228,6 @@
return result;
}
};
- case DIFFERENCE:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- for (int i = 0; i < 3; i++) {
- result[i] = dst[i] + src[i] - (dst[i] * src[i] >> 7);
- }
- result[3] = Math.min(255, src[3] + dst[3]);
- return result;
- }
- };
- case EXCLUSION:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- for (int i = 0; i < 3; i++) {
- result[i] = dst[i] + src[i] - (dst[i] * src[i] >> 7);
- }
- result[3] = Math.min(255, src[3] + dst[3]);
- return result;
- }
- };
- case FREEZE:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- for (int i = 0; i < 3; i++) {
- result[i] = src[i] == 0 ? 0 :
- Math.max(0, 255 - (255 - dst[i]) * (255 - dst[i]) / src[i]);
- }
- result[3] = Math.min(255, src[3] + dst[3]);
- return result;
- }
- };
- case GLOW:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- for (int i = 0; i < 3; i++) {
- result[i] = dst[i] == 255 ? 255 :
- Math.min(255, src[i] * src[i] / (255 - dst[i]));
- }
- result[3] = Math.min(255, src[3] + dst[3]);
- return result;
- }
- };
- case GREEN:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- return new int[] {
- dst[0],
- dst[1],
- src[2],
- Math.min(255, src[3] + dst[3])
- };
- }
- };
- case HARD_LIGHT:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- return new int[] {
- src[0] < 128 ? dst[0] * src[0] >> 7 :
- 255 - ((255 - src[0]) * (255 - dst[0]) >> 7),
- src[1] < 128 ? dst[1] * src[1] >> 7 :
- 255 - ((255 - src[1]) * (255 - dst[1]) >> 7),
- src[2] < 128 ? dst[2] * src[2] >> 7 :
- 255 - ((255 - src[2]) * (255 - dst[2]) >> 7),
- Math.min(255, src[3] + dst[3])
- };
- }
- };
- case HEAT:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- return new int[] {
- dst[0] == 0 ? 0 : Math.max(0, 255 - (255 - src[0]) * (255 - src[0]) / dst[0]),
- dst[1] == 0 ? 0 : Math.max(0, 255 - (255 - src[1]) * (255 - src[1]) / dst[1]),
- dst[2] == 0 ? 0 : Math.max(0, 255 - (255 - src[2]) * (255 - src[2]) / dst[2]),
- Math.min(255, src[3] + dst[3])
- };
- }
- };
- case HUE:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- float[] srcHSL = new float[3];
- RGBtoHSL(src[0], src[1], src[2], srcHSL);
- float[] dstHSL = new float[3];
- RGBtoHSL(dst[0], dst[1], dst[2], dstHSL);
-
- HSLtoRGB(srcHSL[0], dstHSL[1], dstHSL[2], result);
- result[3] = Math.min(255, src[3] + dst[3]);
-
- return result;
- }
- };
- case INVERSE_COLOR_BURN:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- return new int[] {
- dst[0] == 0 ? 0 :
- Math.max(0, 255 - (((255 - src[0]) << 8) / dst[0])),
- dst[1] == 0 ? 0 :
- Math.max(0, 255 - (((255 - src[1]) << 8) / dst[1])),
- dst[2] == 0 ? 0 :
- Math.max(0, 255 - (((255 - src[2]) << 8) / dst[2])),
- Math.min(255, src[3] + dst[3])
- };
- }
- };
- case INVERSE_COLOR_DODGE:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- return new int[] {
- dst[0] == 255 ? 255 :
- Math.min((src[0] << 8) / (255 - dst[0]), 255),
- dst[1] == 255 ? 255 :
- Math.min((src[1] << 8) / (255 - dst[1]), 255),
- dst[2] == 255 ? 255 :
- Math.min((src[2] << 8) / (255 - dst[2]), 255),
- Math.min(255, src[3] + dst[3])
- };
- }
- };
case LIGHTEN:
return new Blender() {
@Override
@@ -584,21 +239,6 @@
return result;
}
};
- case LUMINOSITY:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- float[] srcHSL = new float[3];
- RGBtoHSL(src[0], src[1], src[2], srcHSL);
- float[] dstHSL = new float[3];
- RGBtoHSL(dst[0], dst[1], dst[2], dstHSL);
-
- HSLtoRGB(dstHSL[0], dstHSL[1], srcHSL[2], result);
- result[3] = Math.min(255, src[3] + dst[3]);
-
- return result;
- }
- };
case MULTIPLY:
return new Blender() {
@Override
@@ -606,22 +246,10 @@
for (int i = 0; i < 3; i++) {
result[i] = (src[i] * dst[i]) >> 8;
}
- result[3] = Math.min(255, src[3] + dst[3]);
+ result[3] = Math.min(255, src[3] + dst[3] - (src[3] * dst[3]) / 255);
return result;
}
};
- case NEGATION:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- return new int[] {
- 255 - Math.abs(255 - dst[0] - src[0]),
- 255 - Math.abs(255 - dst[1] - src[1]),
- 255 - Math.abs(255 - dst[2] - src[2]),
- Math.min(255, src[3] + dst[3])
- };
- }
- };
case OVERLAY:
return new Blender() {
@Override
@@ -634,123 +262,15 @@
return result;
}
};
- case RED:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- return new int[] {
- src[0],
- dst[1],
- dst[2],
- Math.min(255, src[3] + dst[3])
- };
- }
- };
- case REFLECT:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- return new int[] {
- src[0] == 255 ? 255 : Math.min(255, dst[0] * dst[0] / (255 - src[0])),
- src[1] == 255 ? 255 : Math.min(255, dst[1] * dst[1] / (255 - src[1])),
- src[2] == 255 ? 255 : Math.min(255, dst[2] * dst[2] / (255 - src[2])),
- Math.min(255, src[3] + dst[3])
- };
- }
- };
- case SATURATION:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- float[] srcHSL = new float[3];
- RGBtoHSL(src[0], src[1], src[2], srcHSL);
- float[] dstHSL = new float[3];
- RGBtoHSL(dst[0], dst[1], dst[2], dstHSL);
-
- HSLtoRGB(dstHSL[0], srcHSL[1], dstHSL[2], result);
- result[3] = Math.min(255, src[3] + dst[3]);
-
- return result;
- }
- };
case SCREEN:
return new Blender() {
@Override
public int[] blend(int[] src, int[] dst, int[] result) {
- return new int[] {
- 255 - ((255 - src[0]) * (255 - dst[0]) >> 8),
- 255 - ((255 - src[1]) * (255 - dst[1]) >> 8),
- 255 - ((255 - src[2]) * (255 - dst[2]) >> 8),
- Math.min(255, src[3] + dst[3])
- };
- }
- };
- case SOFT_BURN:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- return new int[] {
- dst[0] + src[0] < 256 ?
- (dst[0] == 255 ? 255 :
- Math.min(255, (src[0] << 7) / (255 - dst[0]))) :
- Math.max(0, 255 - (((255 - dst[0]) << 7) / src[0])),
- dst[1] + src[1] < 256 ?
- (dst[1] == 255 ? 255 :
- Math.min(255, (src[1] << 7) / (255 - dst[1]))) :
- Math.max(0, 255 - (((255 - dst[1]) << 7) / src[1])),
- dst[2] + src[2] < 256 ?
- (dst[2] == 255 ? 255 :
- Math.min(255, (src[2] << 7) / (255 - dst[2]))) :
- Math.max(0, 255 - (((255 - dst[2]) << 7) / src[2])),
- Math.min(255, src[3] + dst[3])
- };
- }
- };
- case SOFT_DODGE:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- return new int[] {
- dst[0] + src[0] < 256 ?
- (src[0] == 255 ? 255 :
- Math.min(255, (dst[0] << 7) / (255 - src[0]))) :
- Math.max(0, 255 - (((255 - src[0]) << 7) / dst[0])),
- dst[1] + src[1] < 256 ?
- (src[1] == 255 ? 255 :
- Math.min(255, (dst[1] << 7) / (255 - src[1]))) :
- Math.max(0, 255 - (((255 - src[1]) << 7) / dst[1])),
- dst[2] + src[2] < 256 ?
- (src[2] == 255 ? 255 :
- Math.min(255, (dst[2] << 7) / (255 - src[2]))) :
- Math.max(0, 255 - (((255 - src[2]) << 7) / dst[2])),
- Math.min(255, src[3] + dst[3])
- };
- }
- };
- case SOFT_LIGHT:
- break;
- case STAMP:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- return new int[] {
- Math.max(0, Math.min(255, dst[0] + 2 * src[0] - 256)),
- Math.max(0, Math.min(255, dst[1] + 2 * src[1] - 256)),
- Math.max(0, Math.min(255, dst[2] + 2 * src[2] - 256)),
- Math.min(255, src[3] + dst[3])
- };
- }
- };
- case SUBTRACT:
- return new Blender() {
- @Override
- public int[] blend(int[] src, int[] dst, int[] result) {
- return new int[] {
- Math.max(0, src[0] + dst[0] - 256),
- Math.max(0, src[1] + dst[1] - 256),
- Math.max(0, src[2] + dst[2] - 256),
- Math.min(255, src[3] + dst[3])
- };
+ result[0] = 255 - ((255 - src[0]) * (255 - dst[0]) >> 8);
+ result[1] = 255 - ((255 - src[1]) * (255 - dst[1]) >> 8);
+ result[2] = 255 - ((255 - src[2]) * (255 - dst[2]) >> 8);
+ result[3] = Math.min(255, src[3] + dst[3]);
+ return result;
}
};
}
diff --git a/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java
index 4ac376c..1ca94dc 100644
--- a/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java
@@ -103,7 +103,7 @@
// For filtering the colors, the src image should contain the "color" only for pixel values
// which are not transparent in the target image. But, we are using a simple rectangular image
// completely filled with color. Hence some Composite rules do not apply as intended. However,
- // in such cases, they can usually be mapped to some other mode, which produces an
+ // in such cases, they can usually be mapped to some other mode, which produces an approximately
// equivalent result.
private Mode getCompatibleMode(Mode mode) {
Mode m = mode;
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
index 82a5130..dde041b 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
@@ -73,7 +73,7 @@
public static String getTime(int platformVersion) {
if (platformVersion == 0) {
- return "5:00";
+ return "5:10";
}
if (platformVersion < GINGERBREAD) {
return "2:20";
@@ -87,9 +87,12 @@
if (platformVersion < KITKAT) {
return "4:30";
}
- if (platformVersion <= KITKAT_WATCH) {
+ if (platformVersion < LOLLIPOP) {
return "4:40";
}
+ if (platformVersion < LOLLIPOP_MR1) {
+ return "5:00";
+ }
// Should never happen.
return "4:04";
}