Merge "Add View paddingStart and paddingEnd" (466ebb1d) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -696,8 +696,10 @@ package android {
		field public static final int packageNames = 16843651; // 0x1010383
		field public static final int padding = 16842965; // 0x10100d5
		field public static final int paddingBottom = 16842969; // 0x10100d9
		field public static final int paddingEnd = 16843673; // 0x1010399
		field public static final int paddingLeft = 16842966; // 0x10100d6
		field public static final int paddingRight = 16842968; // 0x10100d8
		field public static final int paddingStart = 16843672; // 0x1010398
		field public static final int paddingTop = 16842967; // 0x10100d7
		field public static final int panelBackground = 16842846; // 0x101005e
		field public static final int panelColorBackground = 16842849; // 0x1010061

core/java/android/view/View.java

+228 −20

Original line number	Diff line number	Diff line
		@@ -345,7 +345,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
		* 2 pixels to the right of the left edge. Padding can be set using the
		* {@link #setPadding(int, int, int, int)} method and queried by calling
		* {@link #getPaddingLeft()}, {@link #getPaddingTop()},
		* {@link #getPaddingRight()} and {@link #getPaddingBottom()}.
		* {@link #getPaddingRight()}, {@link #getPaddingBottom()}.
		* </p>
		*
		* <p>
		@@ -607,6 +607,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
		* @attr ref android.R.styleable#View_paddingLeft
		* @attr ref android.R.styleable#View_paddingRight
		* @attr ref android.R.styleable#View_paddingTop
		* @attr ref android.R.styleable#View_paddingStart
		* @attr ref android.R.styleable#View_paddingEnd
		* @attr ref android.R.styleable#View_saveEnabled
		* @attr ref android.R.styleable#View_rotation
		* @attr ref android.R.styleable#View_rotationX
		@@ -1734,11 +1736,20 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		static final int DRAG_HOVERED = 0x00000002;

		/**
		* Indicates whether the view is drawn in right-to-left direction.
		* Indicates whether the view layout direction has been resolved and drawn to the
		* right-to-left direction.
		*
		* @hide
		*/
		static final int RESOLVED_LAYOUT_RTL = 0x00000004;
		static final int LAYOUT_DIRECTION_RESOLVED_RTL = 0x00000004;

		/**
		* Indicates whether the view layout direction has been resolved.
		*
		* @hide
		*/
		static final int LAYOUT_DIRECTION_RESOLVED = 0x00000008;


		/* End of masks for mPrivateFlags2 */

		@@ -2172,6 +2183,33 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		@ViewDebug.ExportedProperty(category = "padding")
		int mUserPaddingLeft;

		/**
		* Cache the paddingTop set by the user to append to the scrollbar's size.
		*/
		@ViewDebug.ExportedProperty(category = "padding")
		int mUserPaddingTop;

		/**
		* Cache if the user padding is relative.
		*
		*/
		@ViewDebug.ExportedProperty(category = "padding")
		boolean mUserPaddingRelative;

		/**
		* Cache the paddingStart set by the user to append to the scrollbar's size.
		*
		*/
		@ViewDebug.ExportedProperty(category = "padding")
		int mUserPaddingStart;

		/**
		* Cache the paddingEnd set by the user to append to the scrollbar's size.
		*
		*/
		@ViewDebug.ExportedProperty(category = "padding")
		int mUserPaddingEnd;

		/**
		* @hide
		*/
		@@ -2523,6 +2561,8 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		int topPadding = -1;
		int rightPadding = -1;
		int bottomPadding = -1;
		int startPadding = -1;
		int endPadding = -1;

		int padding = -1;

		@@ -2568,6 +2608,12 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		case com.android.internal.R.styleable.View_paddingBottom:
		bottomPadding = a.getDimensionPixelSize(attr, -1);
		break;
		case com.android.internal.R.styleable.View_paddingStart:
		startPadding = a.getDimensionPixelSize(attr, -1);
		break;
		case com.android.internal.R.styleable.View_paddingEnd:
		endPadding = a.getDimensionPixelSize(attr, -1);
		break;
		case com.android.internal.R.styleable.View_scrollX:
		x = a.getDimensionPixelOffset(attr, 0);
		break;
		@@ -2822,11 +2868,15 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		setBackgroundDrawable(background);
		}

		mUserPaddingRelative = (startPadding >= 0 \|\| endPadding >= 0);

		if (padding >= 0) {
		leftPadding = padding;
		topPadding = padding;
		rightPadding = padding;
		bottomPadding = padding;
		startPadding = padding;
		endPadding = padding;
		}

		// If the user specified the padding (either with android:padding or
		@@ -2838,6 +2888,15 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		rightPadding >= 0 ? rightPadding : mPaddingRight,
		bottomPadding >= 0 ? bottomPadding : mPaddingBottom);

		// Cache user padding as we cannot fully resolve padding here (we dont have yet the resolved
		// layout direction). Those cached values will be used later during padding resolution.
		mUserPaddingLeft = leftPadding;
		mUserPaddingRight = rightPadding;
		mUserPaddingStart = startPadding;
		mUserPaddingEnd = endPadding;
		mUserPaddingTop = topPadding;
		mUserPaddingBottom = bottomPadding;

		if (viewFlagMasks != 0) {
		setFlags(viewFlagValues, viewFlagMasks);
		}
		@@ -3059,7 +3118,7 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		}

		// Re-apply user/background padding so that scrollbar(s) get added
		recomputePadding();
		resolvePadding();
		}

		/**
		@@ -3084,7 +3143,7 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		if (mVerticalScrollbarPosition != position) {
		mVerticalScrollbarPosition = position;
		computeOpaqueFlags();
		recomputePadding();
		resolvePadding();
		}
		}

		@@ -4315,8 +4374,8 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		@ViewDebug.IntToString(from = LAYOUT_DIRECTION_RTL, to = "RESOLVED_DIRECTION_RTL")
		})
		public int getResolvedLayoutDirection() {
		resolveLayoutDirection();
		return ((mPrivateFlags2 & RESOLVED_LAYOUT_RTL) == RESOLVED_LAYOUT_RTL) ?
		resolveLayoutDirectionIfNeeded();
		return ((mPrivateFlags2 & LAYOUT_DIRECTION_RESOLVED_RTL) == LAYOUT_DIRECTION_RESOLVED_RTL) ?
		LAYOUT_DIRECTION_RTL : LAYOUT_DIRECTION_LTR;
		}

		@@ -8265,7 +8324,7 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		if (isHorizontalScrollBarEnabled() != horizontalScrollBarEnabled) {
		mViewFlags ^= SCROLLBARS_HORIZONTAL;
		computeOpaqueFlags();
		recomputePadding();
		resolvePadding();
		}
		}

		@@ -8295,7 +8354,7 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		if (isVerticalScrollBarEnabled() != verticalScrollBarEnabled) {
		mViewFlags ^= SCROLLBARS_VERTICAL;
		computeOpaqueFlags();
		recomputePadding();
		resolvePadding();
		}
		}

		@@ -8354,7 +8413,7 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		if (style != (mViewFlags & SCROLLBARS_STYLE_MASK)) {
		mViewFlags = (mViewFlags & ~SCROLLBARS_STYLE_MASK) \| (style & SCROLLBARS_STYLE_MASK);
		computeOpaqueFlags();
		recomputePadding();
		resolvePadding();
		}
		}

		@@ -8739,7 +8798,9 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		mPrivateFlags &= ~AWAKEN_SCROLL_BARS_ON_ATTACH;
		}
		jumpDrawablesToCurrentState();
		resolveLayoutDirection();
		resetLayoutDirectionResolution();
		resolveLayoutDirectionIfNeeded();
		resolvePadding();
		if (isFocused()) {
		InputMethodManager imm = InputMethodManager.peekInstance();
		imm.focusIn(this);
		@@ -8747,31 +8808,91 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		}

		/**
		* Resolving the layout direction. LTR is set initially.
		* We are supposing here that the parent directionality will be resolved before its children.
		* Resolve and cache the layout direction. LTR is set initially. This is implicitly supposing
		* that the parent directionality can and will be resolved before its children.
		*/
		private void resolveLayoutDirection() {
		mPrivateFlags2 &= ~RESOLVED_LAYOUT_RTL;
		private void resolveLayoutDirectionIfNeeded() {
		// Do not resolve if it is not needed
		if ((mPrivateFlags2 & LAYOUT_DIRECTION_RESOLVED) == LAYOUT_DIRECTION_RESOLVED) return;

		// Clear any previous layout direction resolution
		mPrivateFlags2 &= ~LAYOUT_DIRECTION_RESOLVED_RTL;

		// Set resolved depending on layout direction
		switch (getLayoutDirection()) {
		case LAYOUT_DIRECTION_INHERIT:
		// If this is root view, no need to look at parent's layout dir.
		if (mParent != null &&
		mParent instanceof ViewGroup &&
		((ViewGroup) mParent).getResolvedLayoutDirection() == LAYOUT_DIRECTION_RTL) {
		mPrivateFlags2 \|= RESOLVED_LAYOUT_RTL;
		mPrivateFlags2 \|= LAYOUT_DIRECTION_RESOLVED_RTL;
		}
		break;
		case LAYOUT_DIRECTION_RTL:
		mPrivateFlags2 \|= RESOLVED_LAYOUT_RTL;
		mPrivateFlags2 \|= LAYOUT_DIRECTION_RESOLVED_RTL;
		break;
		case LAYOUT_DIRECTION_LOCALE:
		if(isLayoutDirectionRtl(Locale.getDefault())) {
		mPrivateFlags2 \|= RESOLVED_LAYOUT_RTL;
		mPrivateFlags2 \|= LAYOUT_DIRECTION_RESOLVED_RTL;
		}
		break;
		default:
		// Nothing to do, LTR by default
		}

		// Set to resolved
		mPrivateFlags2 \|= LAYOUT_DIRECTION_RESOLVED;
		}

		private void resolvePadding() {
		// If the user specified the absolute padding (either with android:padding or
		// android:paddingLeft/Top/Right/Bottom), use this padding, otherwise
		// use the default padding or the padding from the background drawable
		// (stored at this point in mPadding*)
		switch (getResolvedLayoutDirection()) {
		case LAYOUT_DIRECTION_RTL:
		// Start user padding override Right user padding. Otherwise, if Right user
		// padding is not defined, use the default Right padding. If Right user padding
		// is defined, just use it.
		if (mUserPaddingStart >= 0) {
		mUserPaddingRight = mUserPaddingStart;
		} else if (mUserPaddingRight < 0) {
		mUserPaddingRight = mPaddingRight;
		}
		if (mUserPaddingEnd >= 0) {
		mUserPaddingLeft = mUserPaddingEnd;
		} else if (mUserPaddingLeft < 0) {
		mUserPaddingLeft = mPaddingLeft;
		}
		break;
		case LAYOUT_DIRECTION_LTR:
		default:
		// 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) {
		mUserPaddingLeft = mUserPaddingStart;
		} else if (mUserPaddingLeft < 0) {
		mUserPaddingLeft = mPaddingLeft;
		}
		if (mUserPaddingEnd >= 0) {
		mUserPaddingRight = mUserPaddingEnd;
		} else if (mUserPaddingRight < 0) {
		mUserPaddingRight = mPaddingRight;
		}
		}

		mPaddingTop = (mUserPaddingTop >= 0) ? mUserPaddingTop : mPaddingTop;
		mUserPaddingBottom = (mUserPaddingBottom >= 0) ? mUserPaddingBottom : mPaddingBottom;

		recomputePadding();
		}

		/**
		* Reset the resolved layout direction by clearing the corresponding flag
		*/
		private void resetLayoutDirectionResolution() {
		mPrivateFlags2 &= ~LAYOUT_DIRECTION_RESOLVED;
		}

		/**
		@@ -10745,8 +10866,15 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		sThreadLocal.set(padding);
		}
		if (d.getPadding(padding)) {
		switch (d.getResolvedLayoutDirectionSelf()) {
		case LAYOUT_DIRECTION_RTL:
		setPadding(padding.right, padding.top, padding.left, padding.bottom);
		break;
		case LAYOUT_DIRECTION_LTR:
		default:
		setPadding(padding.left, padding.top, padding.right, padding.bottom);
		}
		}

		// Compare the minimum sizes of the old Drawable and the new. If there isn't an old or
		// if it has a different minimum size, we should layout again
		@@ -10831,6 +10959,8 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		public void setPadding(int left, int top, int right, int bottom) {
		boolean changed = false;

		mUserPaddingRelative = false;

		mUserPaddingLeft = left;
		mUserPaddingRight = right;
		mUserPaddingBottom = bottom;
		@@ -10840,11 +10970,16 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		// Common case is there are no scroll bars.
		if ((viewFlags & (SCROLLBARS_VERTICAL\|SCROLLBARS_HORIZONTAL)) != 0) {
		if ((viewFlags & SCROLLBARS_VERTICAL) != 0) {
		// TODO Determine what to do with SCROLLBAR_POSITION_DEFAULT based on RTL settings.
		final int offset = (viewFlags & SCROLLBARS_INSET_MASK) == 0
		? 0 : getVerticalScrollbarWidth();
		switch (mVerticalScrollbarPosition) {
		case SCROLLBAR_POSITION_DEFAULT:
		if (getResolvedLayoutDirection() == LAYOUT_DIRECTION_RTL) {
		left += offset;
		} else {
		right += offset;
		}
		break;
		case SCROLLBAR_POSITION_RIGHT:
		right += offset;
		break;
		@@ -10881,6 +11016,37 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		}
		}

		/**
		* Sets the relative padding. The view may add on the space required to display
		* the scrollbars, depending on the style and visibility of the scrollbars.
		* So the values returned from {@link #getPaddingStart}, {@link #getPaddingTop},
		* {@link #getPaddingEnd} and {@link #getPaddingBottom} may be different
		* from the values set in this call.
		*
		* @attr ref android.R.styleable#View_padding
		* @attr ref android.R.styleable#View_paddingBottom
		* @attr ref android.R.styleable#View_paddingStart
		* @attr ref android.R.styleable#View_paddingEnd
		* @attr ref android.R.styleable#View_paddingTop
		* @param start the start padding in pixels
		* @param top the top padding in pixels
		* @param end the end padding in pixels
		* @param bottom the bottom padding in pixels
		*
		* @hide
		*/
		public void setPaddingRelative(int start, int top, int end, int bottom) {
		mUserPaddingRelative = true;
		switch(getResolvedLayoutDirection()) {
		case LAYOUT_DIRECTION_RTL:
		setPadding(end, top, start, bottom);
		break;
		case LAYOUT_DIRECTION_LTR:
		default:
		setPadding(start, top, end, bottom);
		}
		}

		/**
		* Returns the top padding of this view.
		*
		@@ -10912,6 +11078,20 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		return mPaddingLeft;
		}

		/**
		* Returns the start padding of this view. If there are inset and enabled
		* scrollbars, this value may include the space required to display the
		* scrollbars as well.
		*
		* @return the start padding in pixels
		*
		* @hide
		*/
		public int getPaddingStart() {
		return (getResolvedLayoutDirection() == LAYOUT_DIRECTION_RTL) ?
		mPaddingRight : mPaddingLeft;
		}

		/**
		* Returns the right padding of this view. If there are inset and enabled
		* scrollbars, this value may include the space required to display the
		@@ -10923,6 +11103,34 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
		return mPaddingRight;
		}

		/**
		* Returns the end padding of this view. If there are inset and enabled
		* scrollbars, this value may include the space required to display the
		* scrollbars as well.
		*
		* @return the end padding in pixels
		*
		* @hide
		*/
		public int getPaddingEnd() {
		return (getResolvedLayoutDirection() == LAYOUT_DIRECTION_RTL) ?
		mPaddingLeft : mPaddingRight;
		}

		/**
		* Return if the padding as been set thru relative values
		* {@link #setPaddingRelative(int, int, int, int)} or thru
		* @attr ref android.R.styleable#View_paddingStart or
		* @attr ref android.R.styleable#View_paddingEnd
		*
		* @return true if the padding is relative or false if it is not.
		*
		* @hide
		*/
		public boolean isPaddingRelative() {
		return mUserPaddingRelative;
		}

		/**
		* Changes the selection state of this view. A view can be selected or not.
		* Note that selection is not the same as focus. Views are typically

core/res/res/values/attrs.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -1661,6 +1661,10 @@
		<attr name="paddingRight" format="dimension" />
		<!-- Sets the padding, in pixels, of the bottom edge; see {@link android.R.attr#padding}. -->
		<attr name="paddingBottom" format="dimension" />
		<!-- Sets the padding, in pixels, of the start edge; see {@link android.R.attr#padding}. -->
		<attr name="paddingStart" format="dimension" />
		<!-- Sets the padding, in pixels, of the end edge; see {@link android.R.attr#padding}. -->
		<attr name="paddingEnd" format="dimension" />

		<!-- Boolean that controls whether a view can take focus. By default the user can not
		move focus to a view; by setting this attribute to true the view is

core/res/res/values/public.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -1775,4 +1775,7 @@
		<public type="integer" name="status_bar_notification_info_maxnum" />
		<public type="string" name="status_bar_notification_info_overflow" />

		<public type="attr" name="paddingStart"/>
		<public type="attr" name="paddingEnd"/>

		</resources>

tests/BiDiTests/res/layout/view_padding_mixed.xml

0 → 100644

+135 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2011 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/view_padding_mixed"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent">

		<FrameLayout android:layout_width="match_parent"
		android:layout_height="match_parent">

		<FrameLayout
		android:layout_width="300dp"
		android:layout_height="300dp"
		android:layout_gravity="top\|left"
		android:background="#FF888888"
		android:paddingTop="20dip"
		android:paddingLeft="40dip"
		android:paddingStart="5dip"
		android:paddingBottom="30dip"
		android:paddingRight="50dip"
		android:layoutDirection="ltr">

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="top\|left"
		android:background="#FF0000FF">
		</FrameLayout>

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="bottom\|right"
		android:background="#FF00FF00">
		</FrameLayout>
		</FrameLayout>

		<FrameLayout
		android:layout_width="300dp"
		android:layout_height="300dp"
		android:layout_gravity="top\|center_horizontal"
		android:background="#FF888888"
		android:paddingTop="20dip"
		android:paddingLeft="40dip"
		android:paddingEnd="5dip"
		android:paddingBottom="30dip"
		android:paddingRight="50dip"
		android:layoutDirection="ltr">

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="top\|left"
		android:background="#FF0000FF">
		</FrameLayout>

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="bottom\|right"
		android:background="#FF00FF00">
		</FrameLayout>
		</FrameLayout>

		<FrameLayout
		android:layout_width="300dp"
		android:layout_height="300dp"
		android:layout_gravity="bottom\|left"
		android:background="#FF888888"
		android:paddingTop="20dip"
		android:paddingLeft="40dip"
		android:paddingStart="5dip"
		android:paddingBottom="30dip"
		android:paddingRight="50dip"
		android:layoutDirection="rtl">

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="top\|left"
		android:background="#FF0000FF">
		</FrameLayout>

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="bottom\|right"
		android:background="#FF00FF00">
		</FrameLayout>
		</FrameLayout>

		<FrameLayout
		android:layout_width="300dp"
		android:layout_height="300dp"
		android:layout_gravity="bottom\|center_horizontal"
		android:background="#FF888888"
		android:paddingTop="20dip"
		android:paddingLeft="40dip"
		android:paddingEnd="5dip"
		android:paddingBottom="30dip"
		android:paddingRight="50dip"
		android:layoutDirection="rtl">

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="top\|left"
		android:background="#FF0000FF">
		</FrameLayout>

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="bottom\|right"
		android:background="#FF00FF00">
		</FrameLayout>
		</FrameLayout>

		</FrameLayout>

		</FrameLayout>