Merge "Fix Gravity start/end" (0acb8d30) · Commits · e / os / android_frameworks_base

core/res/res/values/attrs.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -1133,9 +1133,9 @@
		edge, a right gravity will clip the left edge, and neither will clip both edges. -->
		<flag name="clip_horizontal" value="0x08" />
		<!-- Push object to the beginning of its container, not changing its size. -->
		<flag name="before" value="0x00800003" />
		<flag name="start" value="0x00800003" />
		<!-- Push object to the end of its container, not changing its size. -->
		<flag name="after" value="0x00800005" />
		<flag name="end" value="0x00800005" />
		</attr>

		<!-- Controls whether links such as urls and email addresses are

tests/BiDiTests/res/layout/table_layout_locale.xml

+14 −14

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -64,7 +64,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>
		@@ -90,7 +90,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -110,7 +110,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>
		@@ -136,7 +136,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -156,7 +156,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>
		@@ -182,7 +182,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -202,7 +202,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>
		@@ -228,7 +228,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -248,7 +248,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>

tests/BiDiTests/res/layout/table_layout_ltr.xml

+10 −10

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -64,7 +64,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>
		@@ -90,7 +90,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -110,7 +110,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>
		@@ -136,7 +136,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -156,7 +156,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>
		@@ -182,7 +182,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -202,7 +202,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>
		@@ -228,7 +228,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -248,7 +248,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>

tests/BiDiTests/res/layout/table_layout_rtl.xml

+14 −14

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -64,7 +64,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>
		@@ -90,7 +90,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -110,7 +110,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>
		@@ -136,7 +136,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -156,7 +156,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>
		@@ -182,7 +182,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -202,7 +202,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>
		@@ -228,7 +228,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_after_text"
		android:textSize="24dip"
		android:gravity="after"
		android:gravity="end"
		/>
		</TableRow>

		@@ -248,7 +248,7 @@
		android:layout_width="wrap_content"
		android:text="@string/button_before_text"
		android:textSize="24dip"
		android:gravity="before"
		android:gravity="start"
		/>
		</TableRow>
		</TableLayout>