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:
The Android Open Source Project
2010-02-11 10:03:02 -08:00
parent 61bb25f2f9 27f3de6bac
commit 1e90ab542d
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
graphics/java/android/graphics/drawable/RotateDrawable.java
View File

@@ -204,13 +204,27 @@ public class RotateDrawable extends Drawable implements Drawable.Callback {
com.android.internal.R.styleable.RotateDrawable_visible);
TypedValue tv = a.peekValue(com.android.internal.R.styleable.RotateDrawable_pivotX);
boolean pivotXRel = tv.type == TypedValue.TYPE_FRACTION;
float pivotX = pivotXRel ? tv.getFraction(1.0f, 1.0f) : tv.getFloat();
boolean pivotXRel;
float pivotX;
if (tv == null) {
pivotXRel = true;
pivotX = 0.5f;
} else {
pivotXRel = tv.type == TypedValue.TYPE_FRACTION;
pivotX = pivotXRel ? tv.getFraction(1.0f, 1.0f) : tv.getFloat();
}
tv = a.peekValue(com.android.internal.R.styleable.RotateDrawable_pivotY);
boolean pivotYRel = tv.type == TypedValue.TYPE_FRACTION;
float pivotY = pivotYRel ? tv.getFraction(1.0f, 1.0f) : tv.getFloat();
boolean pivotYRel;
float pivotY;
if (tv == null) {
pivotYRel = true;
pivotY = 0.5f;
} else {
pivotYRel = tv.type == TypedValue.TYPE_FRACTION;
pivotY = pivotYRel ? tv.getFraction(1.0f, 1.0f) : tv.getFloat();
}
float fromDegrees = a.getFloat(
com.android.internal.R.styleable.RotateDrawable_fromDegrees, 0.0f);
float toDegrees = a.getFloat(

6
services/java/com/android/server/WindowManagerService.java
View File

@@ -5355,7 +5355,7 @@ public class WindowManagerService extends IWindowManager.Stub
switch (result) {
case INJECT_NO_PERMISSION:
throw new SecurityException(
"Injecting to another application requires INJECT_EVENT permission");
"Injecting to another application requires INJECT_EVENTS permission");
case INJECT_SUCCEEDED:
return true;
}
@@ -5383,7 +5383,7 @@ public class WindowManagerService extends IWindowManager.Stub
switch (result) {
case INJECT_NO_PERMISSION:
throw new SecurityException(
"Injecting to another application requires INJECT_EVENT permission");
"Injecting to another application requires INJECT_EVENTS permission");
case INJECT_SUCCEEDED:
return true;
}
@@ -5411,7 +5411,7 @@ public class WindowManagerService extends IWindowManager.Stub
switch (result) {
case INJECT_NO_PERMISSION:
throw new SecurityException(
"Injecting to another application requires INJECT_EVENT permission");
"Injecting to another application requires INJECT_EVENTS permission");
case INJECT_SUCCEEDED:
return true;
}