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

merge from open-source master

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2009-11-15 11:03:19 -08:00
parent c51e279366 b201f72609
commit 8a4e470fc2
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
graphics/java/android/graphics/ColorMatrix.java
View File

@@ -110,22 +110,31 @@ public class ColorMatrix {
a[18] = aScale;
}
/**
* Set the rotation on a color axis by the specified values.
* axis=0 correspond to a rotation around the RED color
* axis=1 correspond to a rotation around the GREEN color
* axis=2 correspond to a rotation around the BLUE color
*/
public void setRotate(int axis, float degrees) {
reset();
float radians = degrees * (float)Math.PI / 180;
float cosine = FloatMath.cos(radians);
float sine = FloatMath.sin(radians);
switch (axis) {
// Rotation around the red color
case 0:
mArray[6] = mArray[12] = cosine;
mArray[7] = sine;
mArray[11] = -sine;
break;
// Rotation around the green color
case 1:
mArray[0] = mArray[17] = cosine;
mArray[2] = sine;
mArray[15] = -sine;
mArray[0] = mArray[12] = cosine;
mArray[2] = -sine;
mArray[10] = sine;
break;
// Rotation around the blue color
case 2:
mArray[0] = mArray[6] = cosine;
mArray[1] = sine;

2
services/java/com/android/server/LocationManagerService.java
View File

@@ -1315,7 +1315,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
/**
* @return null if the provider does not exits
* @throw SecurityException if the provider is not allowed to be
* @throws SecurityException if the provider is not allowed to be
* accessed by the caller
*/
public Bundle getProviderInfo(String provider) {