Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev (2d3443fc) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -34729,12 +34729,14 @@ package android.view {
		method public void setCallback(android.view.Window.Callback);
		method public abstract void setChildDrawable(int, android.graphics.drawable.Drawable);
		method public abstract void setChildInt(int, int);
		method public void setClipToOutline(boolean);
		method public void setContainer(android.view.Window);
		method public abstract void setContentView(int);
		method public abstract void setContentView(android.view.View);
		method public abstract void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);
		method protected void setDefaultWindowFormat(int);
		method public void setDimAmount(float);
		method public void setElevation(float);
		method public void setEnterTransition(android.transition.Transition);
		method public void setExitTransition(android.transition.Transition);
		method public abstract void setFeatureDrawable(int, android.graphics.drawable.Drawable);

+24 −5

Original line number	Diff line number	Diff line
		@@ -1073,18 +1073,37 @@ public abstract class Window {
		*/
		public abstract void onConfigurationChanged(Configuration newConfig);

		/**
		* Sets the window elevation.
		*
		* @param elevation The window elevation.
		* @see View#setElevation(float)
		* @see android.R.styleable#Window_windowElevation
		*/
		public void setElevation(float elevation) {}

		/**
		* Sets whether window content should be clipped to the outline of the
		* window background.
		*
		* @param clipToOutline Whether window content should be clipped to the
		* outline of the window background.
		* @see View#setClipToOutline(boolean)
		* @see android.R.styleable#Window_windowClipToOutline
		*/
		public void setClipToOutline(boolean clipToOutline) {}

		/**
		* Change the background of this window to a Drawable resource. Setting the
		* background to null will make the window be opaque. To make the window
		* transparent, you can use an empty drawable (for instance a ColorDrawable
		* with the color 0 or the system drawable android:drawable/empty.)
		*
		* @param resid The resource identifier of a drawable resource which will be
		* installed as the new background.
		* @param resId The resource identifier of a drawable resource which will
		* be installed as the new background.
		*/
		public void setBackgroundDrawableResource(int resid)
		{
		setBackgroundDrawable(mContext.getDrawable(resid));
		public void setBackgroundDrawableResource(int resId) {
		setBackgroundDrawable(mContext.getDrawable(resId));
		}

		/**

+16 −0

Original line number	Diff line number	Diff line
		@@ -1331,6 +1331,22 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		return (mContextMenu != null) ? mContextMenu.performIdentifierAction(id, flags) : false;
		}

		@Override
		public final void setElevation(float elevation) {
		mElevation = elevation;
		if (mDecor != null) {
		mDecor.setElevation(elevation);
		}
		}

		@Override
		public final void setClipToOutline(boolean clipToOutline) {
		mClipToOutline = clipToOutline;
		if (mDecor != null) {
		mDecor.setClipToOutline(clipToOutline);
		}
		}

		@Override
		public final void setBackgroundDrawable(Drawable drawable) {
		if (drawable != mBackgroundDrawable \|\| mBackgroundResource != 0) {