Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3941411a authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 1e90ab54: merge from open-source master 

Merge commit '1e90ab54'

* commit '1e90ab54':
  Fixs the incorrect message for SecurityException
  Default RotateDrawable's pivot set to (50%, 50%)
parents 777db0c0 1e90ab54

graphics/java/android/graphics/drawable/RotateDrawable.java

+19 −5
Original line number Diff line number Diff line
@@ -204,12 +204,26 @@ 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);

services/java/com/android/server/WindowManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

        }