Merge "Formalize overscan metrics." (bd0dc13c) · Commits · e / os / android_frameworks_base

core/java/android/service/wallpaper/WallpaperService.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -153,6 +153,7 @@ public abstract class WallpaperService extends Service {
		int mCurWindowPrivateFlags = mWindowPrivateFlags;
		final Rect mVisibleInsets = new Rect();
		final Rect mWinFrame = new Rect();
		final Rect mOverscanInsets = new Rect();
		final Rect mContentInsets = new Rect();
		final Configuration mConfiguration = new Configuration();

		@@ -252,7 +253,7 @@ public abstract class WallpaperService extends Service {

		final BaseIWindow mWindow = new BaseIWindow() {
		@Override
		public void resized(Rect frame, Rect contentInsets,
		public void resized(Rect frame, Rect overscanInsets, Rect contentInsets,
		Rect visibleInsets, boolean reportDraw, Configuration newConfig) {
		Message msg = mCaller.obtainMessageI(MSG_WINDOW_RESIZED,
		reportDraw ? 1 : 0);
		@@ -627,7 +628,7 @@ public abstract class WallpaperService extends Service {

		final int relayoutResult = mSession.relayout(
		mWindow, mWindow.mSeq, mLayout, mWidth, mHeight,
		View.VISIBLE, 0, mWinFrame, mContentInsets,
		View.VISIBLE, 0, mWinFrame, mOverscanInsets, mContentInsets,
		mVisibleInsets, mConfiguration, mSurfaceHolder.mSurface);

		if (DEBUG) Log.v(TAG, "New surface: " + mSurfaceHolder.mSurface

core/java/android/view/IWindow.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ oneway interface IWindow {
		*/
		void executeCommand(String command, String parameters, in ParcelFileDescriptor descriptor);

		void resized(in Rect frame, in Rect contentInsets,
		void resized(in Rect frame, in Rect overscanInsets, in Rect contentInsets,
		in Rect visibleInsets, boolean reportDraw, in Configuration newConfig);
		void moved(int newX, int newY);
		void dispatchAppVisibility(boolean visible);

core/java/android/view/IWindowSession.aidl

+4 −1

Original line number	Diff line number	Diff line
		@@ -63,6 +63,9 @@ interface IWindowSession {
		* {@link WindowManagerGlobal#RELAYOUT_DEFER_SURFACE_DESTROY}.
		* @param outFrame Rect in which is placed the new position/size on
		* screen.
		* @param outOverscanInsets Rect in which is placed the offsets from
		* <var>outFrame</var> in which the content of the window are inside
		* of the display's overlay region.
		* @param outContentInsets Rect in which is placed the offsets from
		* <var>outFrame</var> in which the content of the window should be
		* placed. This can be used to modify the window layout to ensure its
		@@ -84,7 +87,7 @@ interface IWindowSession {
		*/
		int relayout(IWindow window, int seq, in WindowManager.LayoutParams attrs,
		int requestedWidth, int requestedHeight, int viewVisibility,
		int flags, out Rect outFrame,
		int flags, out Rect outFrame, out Rect outOverscanInsets,
		out Rect outContentInsets, out Rect outVisibleInsets,
		out Configuration outConfig, out Surface outSurface);

core/java/android/view/SurfaceView.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ public class SurfaceView extends View {
		MyWindow mWindow;
		final Rect mVisibleInsets = new Rect();
		final Rect mWinFrame = new Rect();
		final Rect mOverscanInsets = new Rect();
		final Rect mContentInsets = new Rect();
		final Configuration mConfiguration = new Configuration();

		@@ -507,7 +508,7 @@ public class SurfaceView extends View {
		mWindow, mWindow.mSeq, mLayout, mWidth, mHeight,
		visible ? VISIBLE : GONE,
		WindowManagerGlobal.RELAYOUT_DEFER_SURFACE_DESTROY,
		mWinFrame, mContentInsets,
		mWinFrame, mOverscanInsets, mContentInsets,
		mVisibleInsets, mConfiguration, mNewSurface);
		if ((relayoutResult & WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME) != 0) {
		mReportDrawNeeded = true;
		@@ -642,7 +643,7 @@ public class SurfaceView extends View {
		}

		@Override
		public void resized(Rect frame, Rect contentInsets,
		public void resized(Rect frame, Rect overscanInsets, Rect contentInsets,
		Rect visibleInsets, boolean reportDraw, Configuration newConfig) {
		SurfaceView surfaceView = mSurfaceView.get();
		if (surfaceView != null) {

core/java/android/view/View.java

+46 −8

Original line number	Diff line number	Diff line
		@@ -5679,18 +5679,43 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		if ((mViewFlags & FITS_SYSTEM_WINDOWS) == FITS_SYSTEM_WINDOWS) {
		mUserPaddingStart = UNDEFINED_PADDING;
		mUserPaddingEnd = UNDEFINED_PADDING;
		Rect localInsets = sThreadLocal.get();
		if (localInsets == null) {
		localInsets = new Rect();
		sThreadLocal.set(localInsets);
		}
		boolean res = computeFitSystemWindows(insets, localInsets);
		internalSetPadding(localInsets.left, localInsets.top,
		localInsets.right, localInsets.bottom);
		return res;
		}
		return false;
		}

		/**
		* @hide Compute the insets that should be consumed by this view and the ones
		* that should propagate to those under it.
		*/
		protected boolean computeFitSystemWindows(Rect inoutInsets, Rect outLocalInsets) {
		if ((mViewFlags & OPTIONAL_FITS_SYSTEM_WINDOWS) == 0
		\|\| mAttachInfo == null
		\|\| (mAttachInfo.mSystemUiVisibility & SYSTEM_UI_LAYOUT_FLAGS) == 0) {
		internalSetPadding(insets.left, insets.top, insets.right, insets.bottom);
		\|\| ((mAttachInfo.mSystemUiVisibility & SYSTEM_UI_LAYOUT_FLAGS) == 0
		&& !mAttachInfo.mOverscanRequested)) {
		outLocalInsets.set(inoutInsets);
		inoutInsets.set(0, 0, 0, 0);
		return true;
		} else {
		internalSetPadding(0, 0, 0, 0);
		// The application wants to take care of fitting system window for
		// the content... however we still need to take care of any overscan here.
		final Rect overscan = mAttachInfo.mOverscanInsets;
		outLocalInsets.set(overscan);
		inoutInsets.left -= overscan.left;
		inoutInsets.top -= overscan.top;
		inoutInsets.right -= overscan.right;
		inoutInsets.bottom -= overscan.bottom;
		return false;
		}
		}
		return false;
		}

		/**
		* Sets whether or not this view should account for system screen decorations
		@@ -17917,6 +17942,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*/
		boolean mUse32BitDrawingCache;

		/**
		* For windows that are full-screen but using insets to layout inside
		* of the screen areas, these are the current insets to appear inside
		* the overscan area of the display.
		*/
		final Rect mOverscanInsets = new Rect();

		/**
		* For windows that are full-screen but using insets to layout inside
		* of the screen decorations, these are the current insets for the
		@@ -18019,6 +18051,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*/
		boolean mHasSystemUiListeners;

		/**
		* Set if the window has requested to extend into the overscan region
		* via WindowManager.LayoutParams.FLAG_LAYOUT_IN_OVERSCAN.
		*/
		boolean mOverscanRequested;

		/**
		* Set if the visibility of any views has changed.
		*/