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

Commit 2c5f7820 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Refactoring of the screen magnification feature."

parents a5c9fd93 152e9bb8

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -154,7 +154,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/view/accessibility/IAccessibilityManager.aidl \

	core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \

	core/java/android/view/IApplicationToken.aidl \

	core/java/android/view/IDisplayContentChangeListener.aidl \

	core/java/android/view/IDisplayMagnificationMediator.aidl \

	core/java/android/view/IDisplayMagnificationController.aidl \

	core/java/android/view/IInputFilter.aidl \

	core/java/android/view/IInputFilterHost.aidl \

	core/java/android/view/IOnKeyguardExitResult.aidl \

CleanSpec.mk

+5 −0
Original line number Diff line number Diff line
@@ -141,6 +141,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/ui/*.ogg) 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/IExtendedNetworkService.java)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/IExtendedNetworkService.P)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/view/IDisplayContentChangeListener.java)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/view/IDisplayContentChangeListener.P)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/view/IWindowManager.java)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/view/IWindowManager.P)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24746,6 +24746,7 @@ package android.view { 
    method public android.graphics.Canvas lockCanvas(android.graphics.Rect) throws java.lang.IllegalArgumentException, android.view.Surface.OutOfResourcesException;

    method public void readFromParcel(android.os.Parcel);

    method public void release();

    method public static java.lang.String rotationToString(int);

    method public deprecated void unlockCanvas(android.graphics.Canvas);

    method public void unlockCanvasAndPost(android.graphics.Canvas);

    method public void writeToParcel(android.os.Parcel, int);

core/java/android/accessibilityservice/AccessibilityService.java

+9 −0
Original line number Diff line number Diff line
@@ -548,6 +548,7 @@ public abstract class AccessibilityService extends Service { 
        private static final int DO_ON_INTERRUPT = 20;

        private static final int DO_ON_ACCESSIBILITY_EVENT = 30;

        private static final int DO_ON_GESTURE = 40;

        private static final int DO_CLEAR_ACCESSIBILITY_NODE_INFO_CACHE = 50;



        private final HandlerCaller mCaller;
@@ -580,6 +581,11 @@ public abstract class AccessibilityService extends Service { 
            mCaller.sendMessage(message);

        }



        public void clearAccessibilityNodeInfoCache() {

            Message message = mCaller.obtainMessage(DO_CLEAR_ACCESSIBILITY_NODE_INFO_CACHE);

            mCaller.sendMessage(message);

        }



        public void executeMessage(Message message) {

            switch (message.what) {

                case DO_ON_ACCESSIBILITY_EVENT :
@@ -611,6 +617,9 @@ public abstract class AccessibilityService extends Service { 
                    final int gestureId = message.arg1;

                    mCallback.onGesture(gestureId);

                    return;

                case DO_CLEAR_ACCESSIBILITY_NODE_INFO_CACHE:

                    AccessibilityInteractionClient.getInstance().clearCache();

                    return;

                default :

                    Log.w(LOG_TAG, "Unknown message type " + message.what);

            }

core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl

+2 −0
Original line number Diff line number Diff line
@@ -33,4 +33,6 @@ import android.view.accessibility.AccessibilityEvent; 
    void onInterrupt();



    void onGesture(int gesture);



    void clearAccessibilityNodeInfoCache();

}