Merge "Screen magnification - feature - framework." into jb-mr1-dev (6da58271) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -153,6 +153,7 @@ 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/IInputFilter.aidl \
		core/java/android/view/IInputFilterHost.aidl \
		core/java/android/view/IOnKeyguardExitResult.aidl \

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -16418,6 +16418,7 @@ package android.os {
		method public void finishBroadcast();
		method public java.lang.Object getBroadcastCookie(int);
		method public E getBroadcastItem(int);
		method public int getRegisteredCallbackCount();
		method public void kill();
		method public void onCallbackDied(E);
		method public void onCallbackDied(E, java.lang.Object);

core/java/android/os/RemoteCallbackList.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -304,4 +304,25 @@ public class RemoteCallbackList<E extends IInterface> {

		mBroadcastCount = -1;
		}

		/**
		* Returns the number of registered callbacks. Note that the number of registered
		* callbacks may differ from the value returned by {@link #beginBroadcast()} since
		* the former returns the number of callbacks registered at the time of the call
		* and the second the number of callback to which the broadcast will be delivered.
		* <p>
		* This function is useful to decide whether to schedule a broadcast if this
		* requires doing some work which otherwise would not be performed.
		* </p>
		*
		* @return The size.
		*/
		public int getRegisteredCallbackCount() {
		synchronized (mCallbacks) {
		if (mKilled) {
		return 0;
		}
		return mCallbacks.size();
		}
		}
		}

core/java/android/provider/Settings.java

+43 −0

Original line number	Diff line number	Diff line
		@@ -3399,6 +3399,46 @@ public final class Settings {
		public static final String ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS =
		"accessibility_web_content_key_bindings";

		/**
		* Setting that specifies whether the display magnification is enabled.
		* Display magnifications allows the user to zoom in the display content
		* and is targeted to low vision users. The current magnification scale
		* is controlled by {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE}.
		*
		* @hide
		*/
		public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED =
		"accessibility_display_magnification_enabled";

		/**
		* Setting that specifies what the display magnification scale is.
		* Display magnifications allows the user to zoom in the display
		* content and is targeted to low vision users. Whether a display
		* magnification is performed is controlled by
		* {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED}
		*
		* @hide
		*/
		public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE =
		"accessibility_display_magnification_scale";

		/**
		* Setting that specifies whether the display magnification should be
		* automatically updated. If this fearture is enabled the system will
		* exit magnification mode or pan the viewport when a context change
		* occurs. For example, on staring a new activity or rotating the screen,
		* the system may zoom out so the user can see the new context he is in.
		* Another example is on showing a window that is not visible in the
		* magnified viewport the system may pan the viewport to make the window
		* the has popped up so the user knows that the context has changed.
		* Whether a screen magnification is performed is controlled by
		* {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED}
		*
		* @hide
		*/
		public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE =
		"accessibility_display_magnification_auto_update";

		/**
		* The timout for considering a press to be a long press in milliseconds.
		* @hide
		@@ -4806,6 +4846,9 @@ public final class Settings {
		PARENTAL_CONTROL_ENABLED,
		PARENTAL_CONTROL_REDIRECT_URL,
		USB_MASS_STORAGE_ENABLED,
		ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
		ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE,
		ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE,
		ACCESSIBILITY_SCRIPT_INJECTION,
		BACKUP_AUTO_RESTORE,
		ENABLED_ACCESSIBILITY_SERVICES,

core/java/android/view/IDisplayContentChangeListener.aidl

0 → 100644

+32 −0

Original line number	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.os.IBinder;
		import android.view.WindowInfo;
		import android.graphics.Rect;

		/**
		* Interface for observing content changes on a display.
		*
		* {@hide}
		*/
		oneway interface IDisplayContentChangeListener {
		void onWindowTransition(int displayId, int transition, in WindowInfo info);
		void onRectangleOnScreenRequested(int displayId, in Rect rectangle, boolean immediate);
		void onRotationChanged(int rotation);
		}