Merge change 21033 into donut (e1b63d22) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/android/os/ServiceManager.java

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 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.os;

		import java.util.Map;

		public final class ServiceManager {

		/**
		* Returns a reference to a service with the given name.
		*
		* @param name the name of the service to get
		* @return a reference to the service, or <code>null</code> if the service doesn't exist
		*/
		public static IBinder getService(String name) {
		return null;
		}

		/**
		* Place a new @a service called @a name into the service
		* manager.
		*
		* @param name the name of the new service
		* @param service the service object
		*/
		public static void addService(String name, IBinder service) {
		// pass
		}

		/**
		* Retrieve an existing service called @a name from the
		* service manager. Non-blocking.
		*/
		public static IBinder checkService(String name) {
		return null;
		}

		/**
		* Return a list of all currently running services.
		*/
		public static String[] listServices() throws RemoteException {
		return null;
		}

		/**
		* This is only intended to be called when the process is first being brought
		* up and bound by the activity manager. There is only one thread in the process
		* at that time, so no locking is done.
		*
		* @param cache the cache of service references
		* @hide
		*/
		public static void initServiceCache(Map<String, IBinder> cache) {
		// pass
		}
		}

tools/layoutlib/bridge/src/android/view/accessibility/AccessibilityManager.java

0 → 100644

+93 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 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.accessibility;

		import android.content.Context;
		import android.content.pm.ServiceInfo;

		import java.util.Collections;
		import java.util.List;

		/**
		* System level service that serves as an event dispatch for {@link AccessibilityEvent}s.
		* Such events are generated when something notable happens in the user interface,
		* for example an {@link android.app.Activity} starts, the focus or selection of a
		* {@link android.view.View} changes etc. Parties interested in handling accessibility
		* events implement and register an accessibility service which extends
		* {@link android.accessibilityservice.AccessibilityService}.
		*
		* @see AccessibilityEvent
		* @see android.accessibilityservice.AccessibilityService
		* @see android.content.Context#getSystemService
		*/
		public final class AccessibilityManager {
		private static AccessibilityManager sInstance = new AccessibilityManager();

		/**
		* Get an AccessibilityManager instance (create one if necessary).
		*
		* @hide
		*/
		public static AccessibilityManager getInstance(Context context) {
		return sInstance;
		}

		/**
		* Create an instance.
		*
		* @param context A {@link Context}.
		*/
		private AccessibilityManager() {
		}

		/**
		* Returns if the {@link AccessibilityManager} is enabled.
		*
		* @return True if this {@link AccessibilityManager} is enabled, false otherwise.
		*/
		public boolean isEnabled() {
		return false;
		}

		/**
		* Sends an {@link AccessibilityEvent}. If this {@link AccessibilityManager} is not
		* enabled the call is a NOOP.
		*
		* @param event The {@link AccessibilityEvent}.
		*
		* @throws IllegalStateException if a client tries to send an {@link AccessibilityEvent}
		* while accessibility is not enabled.
		*/
		public void sendAccessibilityEvent(AccessibilityEvent event) {
		}

		/**
		* Requests interruption of the accessibility feedback from all accessibility services.
		*/
		public void interrupt() {
		}

		/**
		* Returns the {@link ServiceInfo}s of the installed accessibility services.
		*
		* @return An unmodifiable list with {@link ServiceInfo}s.
		*/
		public List<ServiceInfo> getAccessibilityServiceList() {
		List<ServiceInfo> services = null;
		return Collections.unmodifiableList(services);
		}
		}

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java

+114 −114

Original line number	Diff line number	Diff line
		@@ -334,6 +334,11 @@ public final class BridgeContext extends Context {
		return ta;
		}

		@Override
		public Looper getMainLooper() {
		return Looper.myLooper();
		}


		// ------------- private new methods

		@@ -1149,11 +1154,6 @@ public final class BridgeContext extends Context {

		}

		@Override
		public Looper getMainLooper() {
		throw new UnsupportedOperationException();
		}

		@Override
		public Context getApplicationContext() {
		throw new UnsupportedOperationException();

tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -66,8 +66,10 @@ public class Main {
		"android.graphics.ComposeShader", "android.graphics._Original_ComposeShader",
		"android.graphics.RadialGradient", "android.graphics._Original_RadialGradient",
		"android.graphics.SweepGradient", "android.graphics._Original_SweepGradient",
		"android.os.ServiceManager", "android.os._Original_ServiceManager",
		"android.util.FloatMath", "android.util._Original_FloatMath",
		"android.view.SurfaceView", "android.view._Original_SurfaceView",
		"android.view.accessibility.AccessibilityManager", "android.view.accessibility._Original_AccessibilityManager",
		},
		new String[] { // methods deleted from their return type.
		"android.graphics.Paint", // class to delete method from