Merge "DO NOT MERGE - Display mode switches." into mnc-dev (e6c47686) · Commits · e / os / android_frameworks_base

Android.mk

+3 −2

Original line number	Diff line number	Diff line
		@@ -519,10 +519,11 @@ aidl_files := \
		frameworks/base/core/java/android/net/Uri.aidl \
		frameworks/base/core/java/android/net/NetworkRequest.aidl \
		frameworks/base/core/java/android/net/LinkAddress.aidl \
		frameworks/base/core/java/android/view/Surface.aidl \
		frameworks/base/core/java/android/view/WindowContentFrameStats.aidl \
		frameworks/base/core/java/android/view/Display.aidl \
		frameworks/base/core/java/android/view/InputDevice.aidl \
		frameworks/base/core/java/android/view/InputEvent.aidl \
		frameworks/base/core/java/android/view/Surface.aidl \
		frameworks/base/core/java/android/view/WindowContentFrameStats.aidl \
		frameworks/base/core/java/android/view/inputmethod/InputMethodSubtype.aidl \
		frameworks/base/core/java/android/view/inputmethod/CursorAnchorInfo.aidl \
		frameworks/base/core/java/android/view/inputmethod/CompletionInfo.aidl \

api/current.txt

+15 −2

Original line number	Diff line number	Diff line
		@@ -34549,6 +34549,7 @@ package android.view {
		method public int getFlags();
		method public deprecated int getHeight();
		method public void getMetrics(android.util.DisplayMetrics);
		method public android.view.Display.Mode getMode();
		method public java.lang.String getName();
		method public deprecated int getOrientation();
		method public deprecated int getPixelFormat();
		@@ -34560,7 +34561,8 @@ package android.view {
		method public int getRotation();
		method public void getSize(android.graphics.Point);
		method public int getState();
		method public float[] getSupportedRefreshRates();
		method public android.view.Display.Mode[] getSupportedModes();
		method public deprecated float[] getSupportedRefreshRates();
		method public deprecated int getWidth();
		method public boolean isValid();
		field public static final int DEFAULT_DISPLAY = 0; // 0x0
		@@ -34575,6 +34577,16 @@ package android.view {
		field public static final int STATE_UNKNOWN = 0; // 0x0
		}

		public static final class Display.Mode implements android.os.Parcelable {
		method public int describeContents();
		method public int getModeId();
		method public int getPhysicalHeight();
		method public int getPhysicalWidth();
		method public float getRefreshRate();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.view.Display.Mode> CREATOR;
		}

		public class DragEvent implements android.os.Parcelable {
		method public int describeContents();
		method public int getAction();
		@@ -37365,7 +37377,8 @@ package android.view {
		field public float horizontalWeight;
		field public deprecated int memoryType;
		field public java.lang.String packageName;
		field public float preferredRefreshRate;
		field public int preferredDisplayModeId;
		field public deprecated float preferredRefreshRate;
		field public int rotationAnimation;
		field public float screenBrightness;
		field public int screenOrientation;

api/system-current.txt

+15 −2

Original line number	Diff line number	Diff line
		@@ -36771,6 +36771,7 @@ package android.view {
		method public int getFlags();
		method public deprecated int getHeight();
		method public void getMetrics(android.util.DisplayMetrics);
		method public android.view.Display.Mode getMode();
		method public java.lang.String getName();
		method public deprecated int getOrientation();
		method public deprecated int getPixelFormat();
		@@ -36782,7 +36783,8 @@ package android.view {
		method public int getRotation();
		method public void getSize(android.graphics.Point);
		method public int getState();
		method public float[] getSupportedRefreshRates();
		method public android.view.Display.Mode[] getSupportedModes();
		method public deprecated float[] getSupportedRefreshRates();
		method public deprecated int getWidth();
		method public boolean isValid();
		field public static final int DEFAULT_DISPLAY = 0; // 0x0
		@@ -36797,6 +36799,16 @@ package android.view {
		field public static final int STATE_UNKNOWN = 0; // 0x0
		}

		public static final class Display.Mode implements android.os.Parcelable {
		method public int describeContents();
		method public int getModeId();
		method public int getPhysicalHeight();
		method public int getPhysicalWidth();
		method public float getRefreshRate();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.view.Display.Mode> CREATOR;
		}

		public class DragEvent implements android.os.Parcelable {
		method public int describeContents();
		method public int getAction();
		@@ -39590,7 +39602,8 @@ package android.view {
		field public float horizontalWeight;
		field public deprecated int memoryType;
		field public java.lang.String packageName;
		field public float preferredRefreshRate;
		field public int preferredDisplayModeId;
		field public deprecated float preferredRefreshRate;
		field public int rotationAnimation;
		field public float screenBrightness;
		field public int screenOrientation;

core/java/android/hardware/display/DisplayManagerInternal.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -125,11 +125,13 @@ public abstract class DisplayManagerInternal {
		* mirroring.
		* @param requestedRefreshRate The preferred refresh rate for the top-most visible window that
		* has a preference.
		* @param requestedModeId The preferred mode id for the top-most visible window that has a
		* preference.
		* @param inTraversal True if called from WindowManagerService during a window traversal
		* prior to call to performTraversalInTransactionFromWindowManager.
		*/
		public abstract void setDisplayProperties(int displayId, boolean hasContent,
		float requestedRefreshRate, boolean inTraversal);
		float requestedRefreshRate, int requestedModeId, boolean inTraversal);

		/**
		* Applies an offset to the contents of a display, for example to avoid burn-in.

core/java/android/view/Choreographer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,7 @@ public final class Choreographer {
		private static float getRefreshRate() {
		DisplayInfo di = DisplayManagerGlobal.getInstance().getDisplayInfo(
		Display.DEFAULT_DISPLAY);
		return di.refreshRate;
		return di.getMode().getRefreshRate();
		}

		/**