Merge "Make outline and shadow APIs public" (66d792b6) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -345,6 +345,7 @@ package android {
		field public static final int canRetrieveWindowContent = 16843653; // 0x1010385
		field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230
		field public static final deprecated int capitalize = 16843113; // 0x1010169
		field public static final int castsShadow = 16843778; // 0x1010402
		field public static final int category = 16843752; // 0x10103e8
		field public static final int centerBright = 16842956; // 0x10100cc
		field public static final int centerColor = 16843275; // 0x101020b
		@@ -28690,7 +28691,9 @@ package android.view {
		method protected float getBottomFadingEdgeStrength();
		method protected int getBottomPaddingOffset();
		method public float getCameraDistance();
		method public final boolean getCastsShadow();
		method public android.graphics.Rect getClipBounds();
		method public final boolean getClipToOutline();
		method public java.lang.CharSequence getContentDescription();
		method public final android.content.Context getContext();
		method protected android.view.ContextMenu.ContextMenuInfo getContextMenuInfo();
		@@ -28742,6 +28745,7 @@ package android.view {
		method public int getNextFocusRightId();
		method public int getNextFocusUpId();
		method public android.view.View.OnFocusChangeListener getOnFocusChangeListener();
		method public final void getOutline(android.graphics.Path);
		method public int getOverScrollMode();
		method public android.view.ViewOverlay getOverlay();
		method public int getPaddingBottom();
		@@ -28957,8 +28961,10 @@ package android.view {
		method public void setBackgroundResource(int);
		method public final void setBottom(int);
		method public void setCameraDistance(float);
		method public void setCastsShadow(boolean);
		method public void setClickable(boolean);
		method public void setClipBounds(android.graphics.Rect);
		method public void setClipToOutline(boolean);
		method public void setContentDescription(java.lang.CharSequence);
		method public void setDrawingCacheBackgroundColor(int);
		method public void setDrawingCacheEnabled(boolean);
		@@ -29004,6 +29010,7 @@ package android.view {
		method public void setOnLongClickListener(android.view.View.OnLongClickListener);
		method public void setOnSystemUiVisibilityChangeListener(android.view.View.OnSystemUiVisibilityChangeListener);
		method public void setOnTouchListener(android.view.View.OnTouchListener);
		method public void setOutline(android.graphics.Path);
		method public void setOverScrollMode(int);
		method public void setPadding(int, int, int, int);
		method public void setPaddingRelative(int, int, int, int);

core/java/android/view/DisplayList.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -484,9 +484,9 @@ public class DisplayList {
		*
		* If set to true, camera distance will be ignored. Defaults to false.
		*/
		public void setSharesGlobalCamera(boolean sharesGlobalCamera) {
		public void setUsesGlobalCamera(boolean usesGlobalCamera) {
		if (hasNativeDisplayList()) {
		nSetSharesGlobalCamera(mFinalizer.mNativeDisplayList, sharesGlobalCamera);
		nSetUsesGlobalCamera(mFinalizer.mNativeDisplayList, usesGlobalCamera);
		}
		}

		@@ -1116,7 +1116,7 @@ public class DisplayList {
		private static native void nSetOutline(long displayList, long nativePath);
		private static native void nSetClipToOutline(long displayList, boolean clipToOutline);
		private static native void nSetCastsShadow(long displayList, boolean castsShadow);
		private static native void nSetSharesGlobalCamera(long displayList, boolean sharesGlobalCamera);
		private static native void nSetUsesGlobalCamera(long displayList, boolean usesGlobalCamera);
		private static native void nSetAlpha(long displayList, float alpha);
		private static native void nSetHasOverlappingRendering(long displayList,
		boolean hasOverlappingRendering);

core/java/android/view/View.java

+107 −21

Original line number	Diff line number	Diff line
		@@ -2393,7 +2393,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* Flag indicating that view will be transformed by the global camera if rotated in 3d, or given
		* a non-0 Z translation.
		*/
		static final int PFLAG3_SHARES_GLOBAL_CAMERA = 0x200;
		static final int PFLAG3_USES_GLOBAL_CAMERA = 0x200;

		/* End of masks for mPrivateFlags3 */

		@@ -4037,6 +4037,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		case R.styleable.View_layerType:
		setLayerType(a.getInt(attr, LAYER_TYPE_NONE), null);
		break;
		case R.styleable.View_castsShadow:
		if (a.getBoolean(attr, false)) {
		mPrivateFlags3 \|= PFLAG3_CASTS_SHADOW;
		}
		break;
		case R.styleable.View_textDirection:
		// Clear any text direction flag already set
		mPrivateFlags2 &= ~PFLAG2_TEXT_DIRECTION_MASK;
		@@ -10809,9 +10814,20 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		/**
		* @hide
		* Copies the Outline of the View into the Path parameter.
		* <p>
		* If the outline is not set, the parameter Path is set to empty.
		*
		* @param outline Path into which View's outline will be copied. Must be non-null.
		*
		* @see #setOutline(Path)
		* @see #getClipToOutline()
		* @see #setClipToOutline(boolean)
		*/
		public final void getOutline(Path outline) {
		public final void getOutline(@NonNull Path outline) {
		if (outline == null) {
		throw new IllegalArgumentException("Path must be non-null");
		}
		if (mOutline == null) {
		outline.reset();
		} else {
		@@ -10820,30 +10836,58 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		/**
		* @hide
		* Sets the outline of the view, which defines the shape of the shadow it
		* casts, and can used for clipping.
		* <p>
		* If the outline is not set, or {@link Path#isEmpty()}, shadows will be
		* cast from the bounds of the View, and clipToOutline will be ignored.
		*
		* @param outline The new outline of the view. Must be non-null.
		*
		* @see #getOutline(Path)
		* @see #getClipToOutline()
		* @see #setClipToOutline(boolean)
		*/
		public void setOutline(Path path) {
		public void setOutline(@NonNull Path outline) {
		if (outline == null) {
		throw new IllegalArgumentException("Path must be non-null");
		}
		// always copy the path since caller may reuse
		if (mOutline == null) {
		mOutline = new Path(path);
		mOutline = new Path(outline);
		} else {
		mOutline.set(path);
		mOutline.set(outline);
		}

		if (mDisplayList != null) {
		mDisplayList.setOutline(path);
		mDisplayList.setOutline(outline);
		}
		}

		/**
		* @hide
		* Returns whether the outline of the View will be used for clipping.
		*
		* @see #getOutline(Path)
		* @see #setOutline(Path)
		*/
		public final boolean getClipToOutline() {
		return ((mPrivateFlags3 & PFLAG3_CLIP_TO_OUTLINE) != 0);
		}

		/**
		* @hide
		* Sets whether the outline of the View will be used for clipping.
		* <p>
		* The current implementation of outline clipping uses Canvas#clipPath(),
		* and thus does not support anti-aliasing, and is expensive in terms of
		* graphics performance. Therefore, it is strongly recommended that this
		* property only be set temporarily, as in an animation. For the same
		* reasons, there is no parallel XML attribute for this property.
		* <p>
		* If the outline of the view is not set or is empty, no clipping will be
		* performed.
		*
		* @see #getOutline(Path)
		* @see #setOutline(Path)
		*/
		public void setClipToOutline(boolean clipToOutline) {
		// TODO : Add a fast invalidation here.
		@@ -10860,14 +10904,35 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		/**
		* @hide
		* Returns whether the View will cast shadows when its
		* {@link #setTranslationZ(float) z translation} is greater than 0, or it is
		* rotated in 3D.
		*
		* @see #setTranslationZ(float)
		* @see #setRotationX(float)
		* @see #setRotationY(float)
		* @see #setCastsShadow(boolean)
		* @attr ref android.R.styleable#View_castsShadow
		*/
		public final boolean getCastsShadow() {
		return ((mPrivateFlags3 & PFLAG3_CASTS_SHADOW) != 0);
		}

		/**
		* @hide
		* Set to true to enable this View to cast shadows.
		* <p>
		* If enabled, and the View has a z translation greater than 0, or is
		* rotated in 3D, the shadow will be cast onto the current
		* {@link ViewGroup#setIsolatedZVolume(boolean) isolated Z volume},
		* at the z = 0 plane.
		* <p>
		* The shape of the shadow being cast is defined by the
		* {@link #setOutline(Path) outline} of the view, or the rectangular bounds
		* of the view if the outline is not set or is empty.
		*
		* @see #setTranslationZ(float)
		* @see #getCastsShadow()
		* @attr ref android.R.styleable#View_castsShadow
		*/
		public void setCastsShadow(boolean castsShadow) {
		// TODO : Add a fast invalidation here.
		@@ -10884,25 +10949,46 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		/**
		* Returns whether the View will be transformed by the global camera.
		*
		* @see #setUsesGlobalCamera(boolean)
		*
		* @hide
		*/
		public final boolean getSharesGlobalCamera() {
		return ((mPrivateFlags3 & PFLAG3_SHARES_GLOBAL_CAMERA) != 0);
		public final boolean getUsesGlobalCamera() {
		return ((mPrivateFlags3 & PFLAG3_USES_GLOBAL_CAMERA) != 0);
		}

		/**
		* Sets whether the View should be transformed by the global camera.
		* <p>
		* If the view has a Z translation or 3D rotation, perspective from the
		* global camera will be applied. This enables an app to transform multiple
		* views in 3D with coherent perspective projection among them all.
		* <p>
		* Setting this to true will cause {@link #setCameraDistance() camera distance}
		* to be ignored, as the global camera's position will dictate perspective
		* transform.
		* <p>
		* This should not be used in conjunction with {@link android.graphics.Camera}.
		*
		* @see #getUsesGlobalCamera()
		* @see #setTranslationZ(float)
		* @see #setRotationX(float)
		* @see #setRotationY(float)
		*
		* @hide
		*/
		public void setSharesGlobalCamera(boolean sharesGlobalCamera) {
		public void setUsesGlobalCamera(boolean usesGlobalCamera) {
		// TODO : Add a fast invalidation here.
		if (getSharesGlobalCamera() != sharesGlobalCamera) {
		if (sharesGlobalCamera) {
		mPrivateFlags3 \|= PFLAG3_SHARES_GLOBAL_CAMERA;
		if (getUsesGlobalCamera() != usesGlobalCamera) {
		if (usesGlobalCamera) {
		mPrivateFlags3 \|= PFLAG3_USES_GLOBAL_CAMERA;
		} else {
		mPrivateFlags3 &= ~PFLAG3_SHARES_GLOBAL_CAMERA;
		mPrivateFlags3 &= ~PFLAG3_USES_GLOBAL_CAMERA;
		}
		if (mDisplayList != null) {
		mDisplayList.setSharesGlobalCamera(sharesGlobalCamera);
		mDisplayList.setUsesGlobalCamera(usesGlobalCamera);
		}
		}
		}
		@@ -14536,7 +14622,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		displayList.setOutline(mOutline);
		displayList.setClipToOutline(getClipToOutline());
		displayList.setCastsShadow(getCastsShadow());
		displayList.setSharesGlobalCamera(getSharesGlobalCamera());
		displayList.setUsesGlobalCamera(getUsesGlobalCamera());
		float alpha = 1;
		if (mParent instanceof ViewGroup && (((ViewGroup) mParent).mGroupFlags &
		ViewGroup.FLAG_SUPPORT_STATIC_TRANSFORMATIONS) != 0) {

core/java/android/view/ViewGroup.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -3176,6 +3176,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		* @return True if the group should be an isolated Z volume with its own Z
		* ordering space, false if its decendents should inhabit the
		* inherited Z ordering volume.
		* @attr ref android.R.styleable#ViewGroup_isolatedZVolume
		*/
		public void setIsolatedZVolume(boolean isolateZVolume) {
		boolean previousValue = (mGroupFlags & FLAG_ISOLATED_Z_VOLUME) != 0;

core/jni/android_view_DisplayList.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -142,10 +142,10 @@ static void android_view_DisplayList_setCastsShadow(JNIEnv* env,
		displayList->setCastsShadow(castsShadow);
		}

		static void android_view_DisplayList_setSharesGlobalCamera(JNIEnv* env,
		jobject clazz, jlong displayListPtr, jboolean sharesGlobalCamera) {
		static void android_view_DisplayList_setUsesGlobalCamera(JNIEnv* env,
		jobject clazz, jlong displayListPtr, jboolean usesGlobalCamera) {
		DisplayList* displayList = reinterpret_cast<DisplayList*>(displayListPtr);
		displayList->setSharesGlobalCamera(sharesGlobalCamera);
		displayList->setUsesGlobalCamera(usesGlobalCamera);
		}

		static void android_view_DisplayList_setAlpha(JNIEnv* env,
		@@ -420,7 +420,7 @@ static JNINativeMethod gMethods[] = {
		{ "nSetOutline", "(JJ)V", (void*) android_view_DisplayList_setOutline },
		{ "nSetClipToOutline", "(JZ)V", (void*) android_view_DisplayList_setClipToOutline },
		{ "nSetCastsShadow", "(JZ)V", (void*) android_view_DisplayList_setCastsShadow },
		{ "nSetSharesGlobalCamera","(JZ)V", (void*) android_view_DisplayList_setSharesGlobalCamera },
		{ "nSetUsesGlobalCamera", "(JZ)V", (void*) android_view_DisplayList_setUsesGlobalCamera },
		{ "nSetAlpha", "(JF)V", (void*) android_view_DisplayList_setAlpha },
		{ "nSetHasOverlappingRendering", "(JZ)V",
		(void*) android_view_DisplayList_setHasOverlappingRendering },