Merge "Reduce the fade area to save bandwidth." (1003aeb9) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+22 −4

Original line number	Diff line number	Diff line
		@@ -10316,6 +10316,26 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		return 0;
		}

		/**
		* @hide
		* @param offsetRequired
		*/
		protected int getFadeTop(boolean offsetRequired) {
		int top = mPaddingTop;
		if (offsetRequired) top += getTopPaddingOffset();
		return top;
		}

		/**
		* @hide
		* @param offsetRequired
		*/
		protected int getFadeHeight(boolean offsetRequired) {
		int padding = mPaddingTop;
		if (offsetRequired) padding += getTopPaddingOffset();
		return mBottom - mTop - mPaddingBottom - padding;
		}

		/**
		* <p>Indicates whether this view is attached to an hardware accelerated
		* window or not.</p>
		@@ -10427,18 +10447,16 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit

		// Step 2, save the canvas' layers
		int paddingLeft = mPaddingLeft;
		int paddingTop = mPaddingTop;

		final boolean offsetRequired = isPaddingOffsetRequired();
		if (offsetRequired) {
		paddingLeft += getLeftPaddingOffset();
		paddingTop += getTopPaddingOffset();
		}

		int left = mScrollX + paddingLeft;
		int right = left + mRight - mLeft - mPaddingRight - paddingLeft;
		int top = mScrollY + paddingTop;
		int bottom = top + mBottom - mTop - mPaddingBottom - paddingTop;
		int top = mScrollY + getFadeTop(offsetRequired);
		int bottom = top + getFadeHeight(offsetRequired);

		if (offsetRequired) {
		right += getRightPaddingOffset();

+24 −0

Original line number	Diff line number	Diff line
		@@ -5062,6 +5062,30 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		return getExtendedPaddingTop() + voffset + mLayout.getLineBaseline(0);
		}

		/**
		* @hide
		* @param offsetRequired
		*/
		@Override
		protected int getFadeTop(boolean offsetRequired) {
		int voffset = 0;
		if ((mGravity & Gravity.VERTICAL_GRAVITY_MASK) != Gravity.TOP) {
		voffset = getVerticalOffset(true);
		}

		if (offsetRequired) voffset += getTopPaddingOffset();

		return getExtendedPaddingTop() + voffset;
		}

		/**
		* @hide
		* @param offsetRequired
		*/
		protected int getFadeHeight(boolean offsetRequired) {
		return mLayout != null ? mLayout.getHeight() : 0;
		}

		@Override
		public boolean onKeyDown(int keyCode, KeyEvent event) {
		int which = doKeyDown(keyCode, event, null);

+1 −1

Original line number	Diff line number	Diff line
		@@ -125,6 +125,7 @@ OpenGLRenderer::~OpenGLRenderer() {
		///////////////////////////////////////////////////////////////////////////////

		void OpenGLRenderer::setViewport(int width, int height) {
		glDisable(GL_DITHER);
		glViewport(0, 0, width, height);
		mOrthoMatrix.loadOrtho(0, width, height, 0, -1, 1);

		@@ -151,7 +152,6 @@ void OpenGLRenderer::prepareDirty(float left, float top, float right, float bott
		mSaveCount = 1;

		glViewport(0, 0, mWidth, mHeight);
		glDisable(GL_DITHER);

		glEnable(GL_SCISSOR_TEST);
		glScissor(left, mSnapshot->height - bottom, right - left, bottom - top);