summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2011-06-14 17:08:32 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2011-06-14 17:08:32 -0700
commit67f8de04fc94942d6b5e48e3ad8fba79d530bc69 (patch)
tree17e57d9a52c8295113f0c0d4344eefbe5b77bbf6
parentc0053223bedf33581b0830fb87be32c1f26e5372 (diff)
downloadframeworks_base-67f8de04fc94942d6b5e48e3ad8fba79d530bc69.zip
frameworks_base-67f8de04fc94942d6b5e48e3ad8fba79d530bc69.tar.gz
frameworks_base-67f8de04fc94942d6b5e48e3ad8fba79d530bc69.tar.bz2
Fix Gravity start/end
- fix missing attribute value change - update BiDiTest app Change-Id: I0bb8a1ebf0b6097b7b8d488580fea6e882202e23
Diffstat
-rwxr-xr-xcore/res/res/values/attrs.xml4
-rw-r--r--tests/BiDiTests/res/layout/table_layout_locale.xml28
-rw-r--r--tests/BiDiTests/res/layout/table_layout_ltr.xml20
-rw-r--r--tests/BiDiTests/res/layout/table_layout_rtl.xml28
4 files changed, 40 insertions, 40 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 5d357c5..9c25ace 100755
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -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
diff --git a/tests/BiDiTests/res/layout/table_layout_locale.xml b/tests/BiDiTests/res/layout/table_layout_locale.xml
index 2589b40..bd2ad23 100644
--- a/tests/BiDiTests/res/layout/table_layout_locale.xml
+++ b/tests/BiDiTests/res/layout/table_layout_locale.xml
@@ -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>
@@ -73,7 +73,7 @@
android:layout_height="wrap_content"
android:stretchColumns="1,2"
android:layoutDirection="inherit">
-
+
<TableRow>
<Button android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -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>
@@ -119,7 +119,7 @@
android:layout_height="wrap_content"
android:stretchColumns="1,2"
android:layoutDirection="ltr">
-
+
<TableRow>
<Button android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -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>
@@ -165,7 +165,7 @@
android:layout_height="wrap_content"
android:stretchColumns="1,2"
android:layoutDirection="rtl">
-
+
<TableRow>
<Button android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -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>
@@ -211,7 +211,7 @@
android:layout_height="wrap_content"
android:stretchColumns="1,2"
android:layoutDirection="locale">
-
+
<TableRow>
<Button android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -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>
diff --git a/tests/BiDiTests/res/layout/table_layout_ltr.xml b/tests/BiDiTests/res/layout/table_layout_ltr.xml
index d8d412c..18c0817 100644
--- a/tests/BiDiTests/res/layout/table_layout_ltr.xml
+++ b/tests/BiDiTests/res/layout/table_layout_ltr.xml
@@ -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>
diff --git a/tests/BiDiTests/res/layout/table_layout_rtl.xml b/tests/BiDiTests/res/layout/table_layout_rtl.xml
index 53130fe..d7e097d 100644
--- a/tests/BiDiTests/res/layout/table_layout_rtl.xml
+++ b/tests/BiDiTests/res/layout/table_layout_rtl.xml
@@ -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>
@@ -73,7 +73,7 @@
android:layout_height="wrap_content"
android:stretchColumns="1,2"
android:layoutDirection="inherit">
-
+
<TableRow>
<Button android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -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>
@@ -119,7 +119,7 @@
android:layout_height="wrap_content"
android:stretchColumns="1,2"
android:layoutDirection="ltr">
-
+
<TableRow>
<Button android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -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>
@@ -165,7 +165,7 @@
android:layout_height="wrap_content"
android:stretchColumns="1,2"
android:layoutDirection="rtl">
-
+
<TableRow>
<Button android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -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>
@@ -211,7 +211,7 @@
android:layout_height="wrap_content"
android:stretchColumns="1,2"
android:layoutDirection="locale">
-
+
<TableRow>
<Button android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -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>
generated by cgit v1.1 at 2024-09-09 23:11:17 +0000