Merge "Add transition support to PopupWindow" (b5904159) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -38453,6 +38453,8 @@ package android.widget {
		method public void setClippingEnabled(boolean);
		method public void setContentView(android.view.View);
		method public void setElevation(float);
		method public void setEnterTransition(android.transition.Transition);
		method public void setExitTransition(android.transition.Transition);
		method public void setFocusable(boolean);
		method public void setHeight(int);
		method public void setIgnoreCheekPress();

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -40948,6 +40948,8 @@ package android.widget {
		method public void setClippingEnabled(boolean);
		method public void setContentView(android.view.View);
		method public void setElevation(float);
		method public void setEnterTransition(android.transition.Transition);
		method public void setExitTransition(android.transition.Transition);
		method public void setFocusable(boolean);
		method public void setHeight(int);
		method public void setIgnoreCheekPress();

core/java/android/view/View.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -14885,10 +14885,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		void setDisplayListProperties(RenderNode renderNode) {
		if (renderNode != null) {
		renderNode.setHasOverlappingRendering(hasOverlappingRendering());
		if (mParent instanceof ViewGroup) {
		renderNode.setClipToBounds(
		(((ViewGroup) mParent).mGroupFlags & ViewGroup.FLAG_CLIP_CHILDREN) != 0);
		}
		renderNode.setClipToBounds(mParent instanceof ViewGroup
		&& ((ViewGroup) mParent).getClipChildren());

		float alpha = 1;
		if (mParent instanceof ViewGroup && (((ViewGroup) mParent).mGroupFlags &
		ViewGroup.FLAG_SUPPORT_STATIC_TRANSFORMATIONS) != 0) {

core/java/android/view/ViewRootImpl.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -472,8 +472,10 @@ public final class ViewRootImpl implements ViewParent,

		// Compute surface insets required to draw at specified Z value.
		// TODO: Use real shadow insets for a constant max Z.
		if (!attrs.hasManualSurfaceInsets) {
		final int surfaceInset = (int) Math.ceil(view.getZ() * 2);
		attrs.surfaceInsets.set(surfaceInset, surfaceInset, surfaceInset, surfaceInset);
		}

		CompatibilityInfo compatibilityInfo = mDisplayAdjustments.getCompatibilityInfo();
		mTranslator = compatibilityInfo.getTranslator();
		@@ -760,6 +762,7 @@ public final class ViewRootImpl implements ViewParent,
		final int oldInsetRight = mWindowAttributes.surfaceInsets.right;
		final int oldInsetBottom = mWindowAttributes.surfaceInsets.bottom;
		final int oldSoftInputMode = mWindowAttributes.softInputMode;
		final boolean oldHasManualSurfaceInsets = mWindowAttributes.hasManualSurfaceInsets;

		// Keep track of the actual window flags supplied by the client.
		mClientWindowLayoutFlags = attrs.flags;
		@@ -786,6 +789,7 @@ public final class ViewRootImpl implements ViewParent,
		// Restore old surface insets.
		mWindowAttributes.surfaceInsets.set(
		oldInsetLeft, oldInsetTop, oldInsetRight, oldInsetBottom);
		mWindowAttributes.hasManualSurfaceInsets = oldHasManualSurfaceInsets;

		applyKeepScreenOnFlag(mWindowAttributes);

core/java/android/view/WindowManager.java

+21 −1

Original line number	Diff line number	Diff line
		@@ -1326,6 +1326,16 @@ public interface WindowManager extends ViewManager {
		*/
		public final Rect surfaceInsets = new Rect();

		/**
		* Whether the surface insets have been manually set. When set to
		* {@code false}, the view root will automatically determine the
		* appropriate surface insets.
		*
		* @see #surfaceInsets
		* @hide
		*/
		public boolean hasManualSurfaceInsets;

		/**
		* The desired bitmap format. May be one of the constants in
		* {@link android.graphics.PixelFormat}. Default is OPAQUE.
		@@ -1621,6 +1631,7 @@ public interface WindowManager extends ViewManager {
		out.writeInt(surfaceInsets.top);
		out.writeInt(surfaceInsets.right);
		out.writeInt(surfaceInsets.bottom);
		out.writeInt(hasManualSurfaceInsets ? 1 : 0);
		out.writeInt(needsMenuKey);
		}

		@@ -1669,6 +1680,7 @@ public interface WindowManager extends ViewManager {
		surfaceInsets.top = in.readInt();
		surfaceInsets.right = in.readInt();
		surfaceInsets.bottom = in.readInt();
		hasManualSurfaceInsets = in.readInt() != 0;
		needsMenuKey = in.readInt();
		}

		@@ -1851,6 +1863,11 @@ public interface WindowManager extends ViewManager {
		changes \|= SURFACE_INSETS_CHANGED;
		}

		if (hasManualSurfaceInsets != o.hasManualSurfaceInsets) {
		hasManualSurfaceInsets = o.hasManualSurfaceInsets;
		changes \|= SURFACE_INSETS_CHANGED;
		}

		if (needsMenuKey != o.needsMenuKey) {
		needsMenuKey = o.needsMenuKey;
		changes \|= NEEDS_MENU_KEY_CHANGED;
		@@ -1959,8 +1976,11 @@ public interface WindowManager extends ViewManager {
		if (userActivityTimeout >= 0) {
		sb.append(" userActivityTimeout=").append(userActivityTimeout);
		}
		if (!surfaceInsets.equals(Insets.NONE)) {
		if (!surfaceInsets.equals(Insets.NONE) \|\| hasManualSurfaceInsets) {
		sb.append(" surfaceInsets=").append(surfaceInsets);
		if (hasManualSurfaceInsets) {
		sb.append(" (manual)");
		}
		}
		if (needsMenuKey != NEEDS_MENU_UNSET) {
		sb.append(" needsMenuKey=");