Merge "Refactoring of the screen magnification feature." (0bf39c80) · Commits · e / os / android_frameworks_base

Android.mk

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -154,8 +154,7 @@ LOCAL_SRC_FILES += \
	core/java/android/view/accessibility/IAccessibilityManager.aidl \		core/java/android/view/accessibility/IAccessibilityManager.aidl \
	core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \		core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \
	core/java/android/view/IApplicationToken.aidl \		core/java/android/view/IApplicationToken.aidl \
	core/java/android/view/IDisplayMagnificationMediator.aidl \		core/java/android/view/IMagnificationCallbacks.aidl \
	core/java/android/view/IDisplayMagnificationController.aidl \
	core/java/android/view/IInputFilter.aidl \		core/java/android/view/IInputFilter.aidl \
	core/java/android/view/IInputFilterHost.aidl \		core/java/android/view/IInputFilterHost.aidl \
	core/java/android/view/IOnKeyguardExitResult.aidl \		core/java/android/view/IOnKeyguardExitResult.aidl \

CleanSpec.mk

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -145,6 +145,10 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew
	$(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/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.java)
	$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/view/IWindowManager.P)		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/view/IWindowManager.P)
			$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/view/IDisplayMagnificationController.java)
			$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/view/IDisplayMagnificationController.P)
			$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/view/IDisplayMagnificationMediator.java)
			$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/view/IDisplayMagnificationMediator.P)

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

api/current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24754,7 +24754,6 @@ package android.view {
	method public android.graphics.Canvas lockCanvas(android.graphics.Rect) throws java.lang.IllegalArgumentException, android.view.Surface.OutOfResourcesException;		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 readFromParcel(android.os.Parcel);
	method public void release();		method public void release();
	method public static java.lang.String rotationToString(int);
	method public deprecated void unlockCanvas(android.graphics.Canvas);		method public deprecated void unlockCanvas(android.graphics.Canvas);
	method public void unlockCanvasAndPost(android.graphics.Canvas);		method public void unlockCanvasAndPost(android.graphics.Canvas);
	method public void writeToParcel(android.os.Parcel, int);		method public void writeToParcel(android.os.Parcel, int);

core/java/android/view/IDisplayMagnificationMediator.aidl

deleted100644 → 0

+0 −31

Original line number	Original line	Diff line number	Diff line
	/*
	** Copyright 2012, The Android Open Source Project
	**
	** Licensed under the Apache License, Version 2.0 (the "License");
	** you may not use this file except in compliance with the License.
	** You may obtain a copy of the License at
	**
	** http://www.apache.org/licenses/LICENSE-2.0
	**
	** Unless required by applicable law or agreed to in writing, software
	** distributed under the License is distributed on an "AS IS" BASIS,
	** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	** See the License for the specific language governing permissions and
	** limitations under the License.
	*/

	package android.view;

	import android.view.IDisplayMagnificationController;
	import android.view.MagnificationSpec;

	/**
	* {@hide}
	*/
	interface IDisplayMagnificationMediator {
	void addController(int displayId, in IDisplayMagnificationController controller);
	void removeController(in IDisplayMagnificationController controller);
	void setMagnificationSpec(in IDisplayMagnificationController controller,
	in MagnificationSpec spec);
	MagnificationSpec getCompatibleMagnificationSpec(in IBinder windowToken);
	}

core/java/android/view/IDisplayMagnificationController.aidl→core/java/android/view/IMagnificationCallbacks.aidl

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,11 +16,13 @@

	package android.view;		package android.view;

			import android.graphics.Region;

	/**		/**
	* {@hide}		* {@hide}
	*/		*/
	oneway interface IDisplayMagnificationController {		oneway interface IMagnificationCallbacks {
	void onMagnifedFrameChanged(int left, int top, int right, int bottom);		void onMagnifedBoundsChanged(in Region bounds);
	void onRectangleOnScreenRequested(int left, int top, int right, int bottom);		void onRectangleOnScreenRequested(int left, int top, int right, int bottom);
	void onRotationChanged(int rotation);		void onRotationChanged(int rotation);
	void onUserContextChanged();		void onUserContextChanged();