Merge changes I0b8b2ee3,Ib71f8f77,Ica481295,Iaf871389,Iab9a445d (00f33ec9) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -4362,6 +4362,9 @@ public final class ActivityThread {
		if (!tmp.onlyLocalRequest) {
		try {
		ActivityManagerNative.getDefault().activityRelaunched(r.token);
		if (r.window != null) {
		r.window.reportActivityRelaunched();
		}
		} catch (RemoteException e) {
		// If the system process has died, it's game over for everyone.
		}

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ public abstract class WallpaperService extends Service {
		final Rect mDispatchedOutsets = new Rect();
		final Rect mFinalSystemInsets = new Rect();
		final Rect mFinalStableInsets = new Rect();
		final Rect mBackdropFrame = new Rect();
		final Configuration mConfiguration = new Configuration();

		final WindowManager.LayoutParams mLayout
		@@ -675,8 +676,8 @@ public abstract class WallpaperService extends Service {
		final int relayoutResult = mSession.relayout(
		mWindow, mWindow.mSeq, mLayout, mWidth, mHeight,
		View.VISIBLE, 0, mWinFrame, mOverscanInsets, mContentInsets,
		mVisibleInsets, mStableInsets, mOutsets, mConfiguration,
		mSurfaceHolder.mSurface);
		mVisibleInsets, mStableInsets, mOutsets, mBackdropFrame,
		mConfiguration, mSurfaceHolder.mSurface);

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

core/java/android/view/IWindowSession.aidl

+4 −1

Original line number	Diff line number	Diff line
		@@ -81,6 +81,8 @@ interface IWindowSession {
		* so complex relayout of the window should not happen based on them.
		* @param outOutsets Rect in which is placed the dead area of the screen that we would like to
		* treat as real display. Example of such area is a chin in some models of wearable devices.
		* @param outBackdropFrame Rect which is used draw the resizing background during a resize
		* operation.
		* @param outConfiguration New configuration of window, if it is now
		* becoming visible and the global configuration has changed since it
		* was last displayed.
		@@ -93,7 +95,8 @@ interface IWindowSession {
		int requestedWidth, int requestedHeight, int viewVisibility,
		int flags, out Rect outFrame, out Rect outOverscanInsets,
		out Rect outContentInsets, out Rect outVisibleInsets, out Rect outStableInsets,
		out Rect outOutsets, out Configuration outConfig, out Surface outSurface);
		out Rect outOutsets, out Rect outBackdropFrame, out Configuration outConfig,
		out Surface outSurface);

		/**
		* Position a window relative to it's parent (attached) window without triggering

core/java/android/view/SurfaceView.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ public class SurfaceView extends View {
		final Rect mContentInsets = new Rect();
		final Rect mStableInsets = new Rect();
		final Rect mOutsets = new Rect();
		final Rect mBackdropFrame = new Rect();
		final Configuration mConfiguration = new Configuration();

		static final int KEEP_SCREEN_ON_MSG = 1;
		@@ -529,8 +530,8 @@ public class SurfaceView extends View {
		visible ? VISIBLE : GONE,
		WindowManagerGlobal.RELAYOUT_DEFER_SURFACE_DESTROY,
		mWinFrame, mOverscanInsets, mContentInsets,
		mVisibleInsets, mStableInsets, mOutsets, mConfiguration,
		mNewSurface);
		mVisibleInsets, mStableInsets, mOutsets, mBackdropFrame,
		mConfiguration, mNewSurface);
		if ((relayoutResult & WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME) != 0) {
		reportDrawNeeded = true;
		}

core/java/android/view/ViewRootImpl.java

+70 −30

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.view;

		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY;
		import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
		import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;
		import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL;
		import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY;
		@@ -144,6 +145,9 @@ public final class ViewRootImpl implements ViewParent,
		*/
		static final int MAX_TRACKBALL_DELAY = 250;

		private static final int RESIZE_MODE_FREEFORM = 0;
		private static final int RESIZE_MODE_DOCKED_DIVIDER = 1;

		static final ThreadLocal<HandlerActionQueue> sRunQueues = new ThreadLocal<HandlerActionQueue>();

		static final ArrayList<Runnable> sFirstDrawHandlers = new ArrayList();
		@@ -228,8 +232,10 @@ public final class ViewRootImpl implements ViewParent,
		boolean mIsAnimating;

		private boolean mDragResizing;
		private int mResizeMode;
		private int mCanvasOffsetX;
		private int mCanvasOffsetY;
		private boolean mActivityRelaunched;

		CompatibilityInfo.Translator mTranslator;

		@@ -1592,12 +1598,17 @@ public final class ViewRootImpl implements ViewParent,
		frame.width() < desiredWindowWidth && frame.width() != mWidth)
		\|\| (lp.height == ViewGroup.LayoutParams.WRAP_CONTENT &&
		frame.height() < desiredWindowHeight && frame.height() != mHeight));
		windowShouldResize \|= mDragResizing;
		windowShouldResize \|= mDragResizing && mResizeMode == RESIZE_MODE_FREEFORM;

		// If the backdrop frame doesn't equal to a frame, we are starting a resize operation, so
		// force it to be resized.
		windowShouldResize \|= !mPendingBackDropFrame.equals(mWinFrame);

		// If the activity was just relaunched, it might have unfrozen the task bounds (while
		// relaunching), so we need to force a call into window manager to pick up the latest
		// bounds.
		windowShouldResize \|= mActivityRelaunched;

		// Determine whether to compute insets.
		// If there are no inset listeners remaining then we may still need to compute
		// insets in case the old insets were non-empty and must be reset.
		@@ -1786,11 +1797,17 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		final boolean dragResizing = (relayoutResult
		& WindowManagerGlobal.RELAYOUT_RES_DRAG_RESIZING) != 0;
		final boolean freeformResizing = (relayoutResult
		& WindowManagerGlobal.RELAYOUT_RES_DRAG_RESIZING_FREEFORM) != 0;
		final boolean dockedResizing = (relayoutResult
		& WindowManagerGlobal.RELAYOUT_RES_DRAG_RESIZING_DOCKED) != 0;
		final boolean dragResizing = freeformResizing \|\| dockedResizing;
		if (mDragResizing != dragResizing) {
		if (dragResizing) {
		startDragResizing(mPendingBackDropFrame);
		mResizeMode = freeformResizing
		? RESIZE_MODE_FREEFORM
		: RESIZE_MODE_DOCKED_DIVIDER;
		} else {
		// We shouldn't come here, but if we come we should end the resize.
		endDragResizing();
		@@ -1937,29 +1954,7 @@ public final class ViewRootImpl implements ViewParent,
		// in the attach info. We translate only the window frame since on window move
		// the window manager tells us only for the new frame but the insets are the
		// same and we do not want to translate them more than once.

		// TODO: Well, we are checking whether the frame has changed similarly
		// to how this is done for the insets. This is however incorrect since
		// the insets and the frame are translated. For example, the old frame
		// was (1, 1 - 1, 1) and was translated to say (2, 2 - 2, 2), now the new
		// reported frame is (2, 2 - 2, 2) which implies no change but this is not
		// true since we are comparing a not translated value to a translated one.
		// This scenario is rare but we may want to fix that.

		final boolean windowMoved = (mAttachInfo.mWindowLeft != frame.left
		\|\| mAttachInfo.mWindowTop != frame.top);
		if (windowMoved) {
		if (mTranslator != null) {
		mTranslator.translateRectInScreenToAppWinFrame(frame);
		}
		mAttachInfo.mWindowLeft = frame.left;
		mAttachInfo.mWindowTop = frame.top;

		// Update the light position for the new window offsets.
		if (mAttachInfo.mHardwareRenderer != null) {
		mAttachInfo.mHardwareRenderer.setLightCenter(mAttachInfo);
		}
		}
		maybeHandleWindowMove(frame);
		}

		final boolean didLayout = layoutRequested && (!mStopped \|\| mReportNextDraw);
		@@ -2074,6 +2069,7 @@ public final class ViewRootImpl implements ViewParent,
		mFirst = false;
		mWillDrawSoon = false;
		mNewSurfaceNeeded = false;
		mActivityRelaunched = false;
		mViewVisibility = viewVisibility;
		mHadWindowFocus = hasWindowFocus;

		@@ -2123,6 +2119,31 @@ public final class ViewRootImpl implements ViewParent,
		mIsInTraversal = false;
		}

		private void maybeHandleWindowMove(Rect frame) {

		// TODO: Well, we are checking whether the frame has changed similarly
		// to how this is done for the insets. This is however incorrect since
		// the insets and the frame are translated. For example, the old frame
		// was (1, 1 - 1, 1) and was translated to say (2, 2 - 2, 2), now the new
		// reported frame is (2, 2 - 2, 2) which implies no change but this is not
		// true since we are comparing a not translated value to a translated one.
		// This scenario is rare but we may want to fix that.

		final boolean windowMoved = mAttachInfo.mWindowLeft != frame.left
		\|\| mAttachInfo.mWindowTop != frame.top;
		if (windowMoved) {
		if (mTranslator != null) {
		mTranslator.translateRectInScreenToAppWinFrame(frame);
		}
		mAttachInfo.mWindowLeft = frame.left;
		mAttachInfo.mWindowTop = frame.top;

		// Update the light position for the new window offsets.
		if (mAttachInfo.mHardwareRenderer != null) {
		mAttachInfo.mHardwareRenderer.setLightCenter(mAttachInfo);
		}
		}
		}
		private void handleOutOfResourcesException(Surface.OutOfResourcesException e) {
		Log.e(mTag, "OutOfResourcesException initializing HW surface", e);
		try {
		@@ -3384,10 +3405,19 @@ public final class ViewRootImpl implements ViewParent,

		mPendingBackDropFrame.set(mWinFrame);

		// Suppress layouts during resizing - a correct layout will happen when resizing
		// is done, and this just increases system load.
		boolean isDockedDivider = mWindowAttributes.type == TYPE_DOCK_DIVIDER;
		boolean suppress = (mDragResizing && mResizeMode == RESIZE_MODE_DOCKED_DIVIDER)
		\|\| isDockedDivider;
		if (!suppress) {
		if (mView != null) {
		forceLayout(mView);
		}
		requestLayout();
		} else {
		maybeHandleWindowMove(mWinFrame);
		}
		}
		break;
		case MSG_WINDOW_FOCUS_CHANGED: {
		@@ -5500,7 +5530,8 @@ public final class ViewRootImpl implements ViewParent,
		(int) (mView.getMeasuredHeight() * appScale + 0.5f),
		viewVisibility, insetsPending ? WindowManagerGlobal.RELAYOUT_INSETS_PENDING : 0,
		mWinFrame, mPendingOverscanInsets, mPendingContentInsets, mPendingVisibleInsets,
		mPendingStableInsets, mPendingOutsets, mPendingConfiguration, mSurface);
		mPendingStableInsets, mPendingOutsets, mPendingBackDropFrame, mPendingConfiguration,
		mSurface);
		//Log.d(mTag, "<<<<<< BACK FROM relayout");
		if (restore) {
		params.restore();
		@@ -7025,6 +7056,15 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		/**
		* Tells this instance that its corresponding activity has just relaunched. In this case, we
		* need to force a relayout of the window to make sure we get the correct bounds from window
		* manager.
		*/
		public void reportActivityRelaunched() {
		mActivityRelaunched = true;
		}

		/**
		* Class for managing the accessibility interaction connection
		* based on the global accessibility state.