Merge "Fix bug #4796027 left/right padding regression after recent View change" (374d757e) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -8860,12 +8860,12 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		// Start user padding override Left user padding. Otherwise, if Left user
		// padding is not defined, use the default left padding. If Left user padding
		// is defined, just use it.
		if (mUserPaddingStart >= 0) {
		if (mUserPaddingStart > 0) {
		mUserPaddingLeft = mUserPaddingStart;
		} else if (mUserPaddingLeft < 0) {
		mUserPaddingLeft = mPaddingLeft;
		}
		if (mUserPaddingEnd >= 0) {
		if (mUserPaddingEnd > 0) {
		mUserPaddingRight = mUserPaddingEnd;
		} else if (mUserPaddingRight < 0) {
		mUserPaddingRight = mPaddingRight;