am fa25bf53: Add display manager skeleton. (76a98148) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,7 @@ LOCAL_SRC_FILES += \
		core/java/android/content/pm/IPackageStatsObserver.aidl \
		core/java/android/database/IContentObserver.aidl \
		core/java/android/hardware/ISerialManager.aidl \
		core/java/android/hardware/display/IDisplayManager.aidl \
		core/java/android/hardware/input/IInputManager.aidl \
		core/java/android/hardware/input/IInputDevicesChangedListener.aidl \
		core/java/android/hardware/usb/IUsbManager.aidl \

api/16.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -22892,7 +22892,7 @@ package android.view {
		method protected void onApplyThemeResource(android.content.res.Resources.Theme, int, boolean);
		}

		public class Display {
		public final class Display {
		method public void getCurrentSizeRange(android.graphics.Point, android.graphics.Point);
		method public int getDisplayId();
		method public deprecated int getHeight();

api/current.txt

+12 −2

Original line number	Diff line number	Diff line
		@@ -5355,6 +5355,7 @@ package android.content {
		field public static final int CONTEXT_INCLUDE_CODE = 1; // 0x1
		field public static final int CONTEXT_RESTRICTED = 4; // 0x4
		field public static final java.lang.String DEVICE_POLICY_SERVICE = "device_policy";
		field public static final java.lang.String DISPLAY_SERVICE = "display";
		field public static final java.lang.String DOWNLOAD_SERVICE = "download";
		field public static final java.lang.String DROPBOX_SERVICE = "dropbox";
		field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";
		@@ -9952,6 +9953,13 @@ package android.hardware {

		}

		package android.hardware.display {

		public final class DisplayManager {
		}

		}

		package android.hardware.input {

		public final class InputManager {
		@@ -23120,13 +23128,15 @@ package android.view {
		method protected void onApplyThemeResource(android.content.res.Resources.Theme, int, boolean);
		}

		public class Display {
		public final class Display {
		method public void getCurrentSizeRange(android.graphics.Point, android.graphics.Point);
		method public int getDisplayId();
		method public deprecated int getHeight();
		method public void getMetrics(android.util.DisplayMetrics);
		method public deprecated int getOrientation();
		method public int getPixelFormat();
		method public deprecated int getPixelFormat();
		method public void getRealMetrics(android.util.DisplayMetrics);
		method public void getRealSize(android.graphics.Point);
		method public void getRectSize(android.graphics.Rect);
		method public float getRefreshRate();
		method public int getRotation();

core/java/android/app/ContextImpl.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import android.hardware.ISerialManager;
		import android.hardware.SensorManager;
		import android.hardware.SerialManager;
		import android.hardware.SystemSensorManager;
		import android.hardware.display.DisplayManager;
		import android.hardware.input.IInputManager;
		import android.hardware.input.InputManager;
		import android.hardware.usb.IUsbManager;
		@@ -343,6 +344,11 @@ class ContextImpl extends Context {
		return InputManager.getInstance();
		}});

		registerService(DISPLAY_SERVICE, new StaticServiceFetcher() {
		public Object createStaticService() {
		return DisplayManager.getInstance();
		}});

		registerService(INPUT_METHOD_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		return InputMethodManager.getInstance(ctx);

core/java/android/content/Context.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -1953,6 +1953,15 @@ public abstract class Context {
		*/
		public static final String INPUT_SERVICE = "input";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.hardware.display.DisplayManager} for interacting with display devices.
		*
		* @see #getSystemService
		* @see android.hardware.display.DisplayManager
		*/
		public static final String DISPLAY_SERVICE = "display";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.os.SchedulingPolicyService} for managing scheduling policy.