diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-06-06 18:23:10 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2011-06-07 14:21:31 -0700 |
commit | c46f7ffa9079f3ae8a5204e7519ed7a1250116d0 (patch) | |
tree | 627572fff083f36ef56c8f3c1c10b9b5cafac264 /tests/BiDiTests/res/layout | |
parent | fd65e00d629a58077eba18a9414a60f6bc3d0336 (diff) | |
download | frameworks_base-c46f7ffa9079f3ae8a5204e7519ed7a1250116d0.zip frameworks_base-c46f7ffa9079f3ae8a5204e7519ed7a1250116d0.tar.gz frameworks_base-c46f7ffa9079f3ae8a5204e7519ed7a1250116d0.tar.bz2 |
Rename atribute View horizontalDirection to layoutDirection and update unit tests
- update before/after to start/end in unit test app
Change-Id: Id7286ef5d9390540faf8ecd5f0b1c140d04bb364
Diffstat (limited to 'tests/BiDiTests/res/layout')
-rw-r--r-- | tests/BiDiTests/res/layout/frame_layout_ltr.xml | 10 | ||||
-rw-r--r-- | tests/BiDiTests/res/layout/frame_layout_rtl.xml | 10 | ||||
-rw-r--r-- | tests/BiDiTests/res/layout/linear_layout_ltr.xml | 14 | ||||
-rw-r--r-- | tests/BiDiTests/res/layout/linear_layout_rtl.xml | 14 | ||||
-rw-r--r-- | tests/BiDiTests/res/layout/relative_layout_ltr.xml | 10 | ||||
-rw-r--r-- | tests/BiDiTests/res/layout/relative_layout_ltr_2.xml | 8 | ||||
-rw-r--r-- | tests/BiDiTests/res/layout/relative_layout_rtl.xml | 10 | ||||
-rw-r--r-- | tests/BiDiTests/res/layout/relative_layout_rtl_2.xml | 8 | ||||
-rw-r--r-- | tests/BiDiTests/res/layout/table_layout_ltr.xml | 8 | ||||
-rw-r--r-- | tests/BiDiTests/res/layout/table_layout_rtl.xml | 8 |
10 files changed, 50 insertions, 50 deletions
diff --git a/tests/BiDiTests/res/layout/frame_layout_ltr.xml b/tests/BiDiTests/res/layout/frame_layout_ltr.xml index bd324e3..61fd06e 100644 --- a/tests/BiDiTests/res/layout/frame_layout_ltr.xml +++ b/tests/BiDiTests/res/layout/frame_layout_ltr.xml @@ -18,7 +18,7 @@ android:id="@+id/frame_layout_ltr" android:layout_width="match_parent" android:layout_height="match_parent" - android:horizontalDirection="ltr" + android:layoutDirection="ltr" android:background="#FF000000"> <FrameLayout @@ -52,28 +52,28 @@ <FrameLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="top|before" + android:layout_gravity="top|start" android:background="#FFFFFFFF"> </FrameLayout> <FrameLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="top|after" + android:layout_gravity="top|end" android:background="#FFFFFF00"> </FrameLayout> <FrameLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="bottom|before" + android:layout_gravity="bottom|start" android:background="#FFFFFFFF"> </FrameLayout> <FrameLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="bottom|after" + android:layout_gravity="bottom|end" android:background="#FFFFFF00"> </FrameLayout> diff --git a/tests/BiDiTests/res/layout/frame_layout_rtl.xml b/tests/BiDiTests/res/layout/frame_layout_rtl.xml index 814f5e1..598b41a 100644 --- a/tests/BiDiTests/res/layout/frame_layout_rtl.xml +++ b/tests/BiDiTests/res/layout/frame_layout_rtl.xml @@ -18,7 +18,7 @@ android:id="@+id/frame_layout_ltr" android:layout_width="match_parent" android:layout_height="match_parent" - android:horizontalDirection="rtl" + android:layoutDirection="rtl" android:background="#FF000000"> <FrameLayout @@ -52,28 +52,28 @@ <FrameLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="top|before" + android:layout_gravity="top|start" android:background="#FFFFFFFF"> </FrameLayout> <FrameLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="top|after" + android:layout_gravity="top|end" android:background="#FFFFFF00"> </FrameLayout> <FrameLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="bottom|before" + android:layout_gravity="bottom|start" android:background="#FFFFFFFF"> </FrameLayout> <FrameLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="bottom|after" + android:layout_gravity="bottom|end" android:background="#FFFFFF00"> </FrameLayout> diff --git a/tests/BiDiTests/res/layout/linear_layout_ltr.xml b/tests/BiDiTests/res/layout/linear_layout_ltr.xml index c5a8d47..d4386f2 100644 --- a/tests/BiDiTests/res/layout/linear_layout_ltr.xml +++ b/tests/BiDiTests/res/layout/linear_layout_ltr.xml @@ -19,7 +19,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:horizontalDirection="ltr"> + android:layoutDirection="ltr"> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" @@ -51,7 +51,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:horizontalDirection="inherit"> + android:layoutDirection="inherit"> <Button android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -78,7 +78,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:horizontalDirection="ltr"> + android:layoutDirection="ltr"> <Button android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -105,7 +105,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:horizontalDirection="rtl"> + android:layoutDirection="rtl"> <Button android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -132,7 +132,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:horizontalDirection="inherit"> + android:layoutDirection="inherit"> <Button android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -159,7 +159,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:horizontalDirection="ltr"> + android:layoutDirection="ltr"> <Button android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -186,7 +186,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:horizontalDirection="rtl"> + android:layoutDirection="rtl"> <Button android:layout_height="wrap_content" android:layout_width="wrap_content" diff --git a/tests/BiDiTests/res/layout/linear_layout_rtl.xml b/tests/BiDiTests/res/layout/linear_layout_rtl.xml index 1494fec..9d07263 100644 --- a/tests/BiDiTests/res/layout/linear_layout_rtl.xml +++ b/tests/BiDiTests/res/layout/linear_layout_rtl.xml @@ -19,7 +19,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:horizontalDirection="rtl"> + android:layoutDirection="rtl"> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" @@ -51,7 +51,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:horizontalDirection="inherit"> + android:layoutDirection="inherit"> <Button android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -78,7 +78,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:horizontalDirection="ltr"> + android:layoutDirection="ltr"> <Button android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -105,7 +105,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:horizontalDirection="rtl"> + android:layoutDirection="rtl"> <Button android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -132,7 +132,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:horizontalDirection="inherit"> + android:layoutDirection="inherit"> <Button android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -159,7 +159,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:horizontalDirection="ltr"> + android:layoutDirection="ltr"> <Button android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -186,7 +186,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:horizontalDirection="rtl"> + android:layoutDirection="rtl"> <Button android:layout_height="wrap_content" android:layout_width="wrap_content" diff --git a/tests/BiDiTests/res/layout/relative_layout_ltr.xml b/tests/BiDiTests/res/layout/relative_layout_ltr.xml index 53ae7c3..d789707 100644 --- a/tests/BiDiTests/res/layout/relative_layout_ltr.xml +++ b/tests/BiDiTests/res/layout/relative_layout_ltr.xml @@ -18,7 +18,7 @@ android:id="@+id/frame_layout_ltr" android:layout_width="match_parent" android:layout_height="match_parent" - android:horizontalDirection="ltr" + android:layoutDirection="ltr" android:background="#FF000000"> <RelativeLayout @@ -52,28 +52,28 @@ <RelativeLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="top|before" + android:layout_gravity="top|start" android:background="#FFFFFFFF"> </RelativeLayout> <RelativeLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="top|after" + android:layout_gravity="top|end" android:background="#FFFFFF00"> </RelativeLayout> <RelativeLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="bottom|before" + android:layout_gravity="bottom|start" android:background="#FFFFFFFF"> </RelativeLayout> <RelativeLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="bottom|after" + android:layout_gravity="bottom|end" android:background="#FFFFFF00"> </RelativeLayout> diff --git a/tests/BiDiTests/res/layout/relative_layout_ltr_2.xml b/tests/BiDiTests/res/layout/relative_layout_ltr_2.xml index 93d1b4b..a13ef8b 100644 --- a/tests/BiDiTests/res/layout/relative_layout_ltr_2.xml +++ b/tests/BiDiTests/res/layout/relative_layout_ltr_2.xml @@ -19,7 +19,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:horizontalDirection="ltr"> + android:layoutDirection="ltr"> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:background="#FF000000" android:padding="10px" - android:horizontalDirection="ltr"> + android:layoutDirection="ltr"> <TextView android:id="@+id/label_2" android:layout_width="fill_parent" @@ -91,7 +91,7 @@ android:layout_height="wrap_content" android:background="#FF000000" android:padding="10px" - android:horizontalDirection="inherit"> + android:layoutDirection="inherit"> <TextView android:id="@+id/label_3" android:layout_width="fill_parent" @@ -124,7 +124,7 @@ android:layout_height="wrap_content" android:background="#FF000000" android:padding="10px" - android:horizontalDirection="rtl"> + android:layoutDirection="rtl"> <TextView android:id="@+id/label_4" android:layout_width="fill_parent" diff --git a/tests/BiDiTests/res/layout/relative_layout_rtl.xml b/tests/BiDiTests/res/layout/relative_layout_rtl.xml index 4b87752..5808924 100644 --- a/tests/BiDiTests/res/layout/relative_layout_rtl.xml +++ b/tests/BiDiTests/res/layout/relative_layout_rtl.xml @@ -18,7 +18,7 @@ android:id="@+id/frame_layout_rtl" android:layout_width="match_parent" android:layout_height="match_parent" - android:horizontalDirection="rtl" + android:layoutDirection="rtl" android:background="#FF000000"> <RelativeLayout @@ -52,28 +52,28 @@ <RelativeLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="top|before" + android:layout_gravity="top|start" android:background="#FFFFFFFF"> </RelativeLayout> <RelativeLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="top|after" + android:layout_gravity="top|end" android:background="#FFFFFF00"> </RelativeLayout> <RelativeLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="bottom|before" + android:layout_gravity="bottom|start" android:background="#FFFFFFFF"> </RelativeLayout> <RelativeLayout android:layout_width="100dp" android:layout_height="100dp" - android:layout_gravity="bottom|after" + android:layout_gravity="bottom|end" android:background="#FFFFFF00"> </RelativeLayout> diff --git a/tests/BiDiTests/res/layout/relative_layout_rtl_2.xml b/tests/BiDiTests/res/layout/relative_layout_rtl_2.xml index 8418e72..1a6b3d5 100644 --- a/tests/BiDiTests/res/layout/relative_layout_rtl_2.xml +++ b/tests/BiDiTests/res/layout/relative_layout_rtl_2.xml @@ -19,7 +19,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:horizontalDirection="rtl"> + android:layoutDirection="rtl"> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:background="#FF000000" android:padding="10px" - android:horizontalDirection="ltr"> + android:layoutDirection="ltr"> <TextView android:id="@+id/label_2" android:layout_width="fill_parent" @@ -91,7 +91,7 @@ android:layout_height="wrap_content" android:background="#FF000000" android:padding="10px" - android:horizontalDirection="inherit"> + android:layoutDirection="inherit"> <TextView android:id="@+id/label_3" android:layout_width="fill_parent" @@ -124,7 +124,7 @@ android:layout_height="wrap_content" android:background="#FF000000" android:padding="10px" - android:horizontalDirection="rtl"> + android:layoutDirection="rtl"> <TextView android:id="@+id/label_4" android:layout_width="fill_parent" diff --git a/tests/BiDiTests/res/layout/table_layout_ltr.xml b/tests/BiDiTests/res/layout/table_layout_ltr.xml index f44de8e..8e1891e 100644 --- a/tests/BiDiTests/res/layout/table_layout_ltr.xml +++ b/tests/BiDiTests/res/layout/table_layout_ltr.xml @@ -19,7 +19,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:horizontalDirection="ltr"> + android:layoutDirection="ltr"> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" @@ -72,7 +72,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:stretchColumns="1,2" - android:horizontalDirection="inherit"> + android:layoutDirection="inherit"> <TableRow> <Button android:layout_height="wrap_content" @@ -120,7 +120,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:stretchColumns="1,2" - android:horizontalDirection="ltr"> + android:layoutDirection="ltr"> <TableRow> <Button android:layout_height="wrap_content" @@ -168,7 +168,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:stretchColumns="1,2" - android:horizontalDirection="rtl"> + android:layoutDirection="rtl"> <TableRow> <Button android:layout_height="wrap_content" diff --git a/tests/BiDiTests/res/layout/table_layout_rtl.xml b/tests/BiDiTests/res/layout/table_layout_rtl.xml index 84270ba..bd664e4 100644 --- a/tests/BiDiTests/res/layout/table_layout_rtl.xml +++ b/tests/BiDiTests/res/layout/table_layout_rtl.xml @@ -19,7 +19,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:horizontalDirection="rtl"> + android:layoutDirection="rtl"> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" @@ -72,7 +72,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:stretchColumns="1,2" - android:horizontalDirection="inherit"> + android:layoutDirection="inherit"> <TableRow> <Button android:layout_height="wrap_content" @@ -120,7 +120,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:stretchColumns="1,2" - android:horizontalDirection="ltr"> + android:layoutDirection="ltr"> <TableRow> <Button android:layout_height="wrap_content" @@ -168,7 +168,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:stretchColumns="1,2" - android:horizontalDirection="rtl"> + android:layoutDirection="rtl"> <TableRow> <Button android:layout_height="wrap_content" |