diff options
Diffstat (limited to 'tests/BiDiTests')
-rw-r--r-- | tests/BiDiTests/res/layout/basic.xml | 38 | ||||
-rw-r--r-- | tests/BiDiTests/res/layout/textview_direction_ltr.xml | 305 | ||||
-rw-r--r-- | tests/BiDiTests/res/layout/textview_direction_rtl.xml | 305 | ||||
-rw-r--r-- | tests/BiDiTests/res/values/strings.xml | 3 | ||||
-rw-r--r-- | tests/BiDiTests/src/com/android/bidi/BiDiTestBasic.java | 29 |
5 files changed, 507 insertions, 173 deletions
diff --git a/tests/BiDiTests/res/layout/basic.xml b/tests/BiDiTests/res/layout/basic.xml index d438b2c..ed91c49 100644 --- a/tests/BiDiTests/res/layout/basic.xml +++ b/tests/BiDiTests/res/layout/basic.xml @@ -40,7 +40,7 @@ android:textSize="32dip" android:text="@string/textview_text" /> - + <EditText android:id="@+id/edittext" android:layout_height="wrap_content" android:layout_width="match_parent" @@ -49,6 +49,40 @@ </LinearLayout> + <Button android:id="@+id/button_alert_dialog" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:text="@string/button_alert_dialog_text" + android:textSize="32dip" + /> + </LinearLayout> + + <LinearLayout + android:layout_width="600dip" + android:layout_height="128dip" + android:layout_gravity="center_vertical" + android:orientation="horizontal" + style="@android:style/Widget.Holo.Spinner" + > + <LinearLayout + android:layout_width="0dip" + android:layout_weight="1" + android:layout_height="match_parent" + android:layout_gravity="center_vertical" + android:orientation="vertical" + > + <TextView + android:id="@+id/spinner_line_1" + android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="1" + android:textSize="16dip" + android:singleLine="true" + android:ellipsize="end" + android:gravity="left|center_vertical" + android:text="@string/button_text" + /> + </LinearLayout> </LinearLayout> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/tests/BiDiTests/res/layout/textview_direction_ltr.xml b/tests/BiDiTests/res/layout/textview_direction_ltr.xml index f7b7b8e..2c790ec 100644 --- a/tests/BiDiTests/res/layout/textview_direction_ltr.xml +++ b/tests/BiDiTests/res/layout/textview_direction_ltr.xml @@ -18,95 +18,232 @@ android:id="@+id/textview_direction_ltr" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layoutDirection="ltr"> + android:layoutDirection="ltr" + android:textDirection="ltr"> - <LinearLayout android:orientation="vertical" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textDirection="ltr"> - - <LinearLayout android:orientation="vertical" + <TableLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_text" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_text" - android:textDirection="inherit" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_text" - android:textDirection="firstStrong" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_text" - android:textDirection="anyRtl" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_text" - android:textDirection="ltr" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_text" - android:textDirection="rtl" - /> - </LinearLayout> + <TableRow> + <TextView android:text="(unspecified)" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="serif" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_hebrew_text" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_latin_text" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_multiline_text" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + </TableRow> - <LinearLayout android:orientation="vertical" - android:layout_width="wrap_content" - android:layout_height="wrap_content"> + <TableRow> + <TextView android:text="inherit" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="serif" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_hebrew_text" + android:textDirection="inherit" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_latin_text" + android:textDirection="inherit" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_multiline_text" + android:textDirection="inherit" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + </TableRow> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_hebrew_text" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_hebrew_text" - android:textDirection="inherit" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_hebrew_text" - android:textDirection="firstStrong" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_hebrew_text" - android:textDirection="anyRtl" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_hebrew_text" - android:textDirection="ltr" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_hebrew_text" - android:textDirection="rtl" - /> - </LinearLayout> + <TableRow> + <TextView android:text="firstStrong" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="serif" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_hebrew_text" + android:textDirection="firstStrong" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_latin_text" + android:textDirection="firstStrong" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_multiline_text" + android:textDirection="firstStrong" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + </TableRow> + + <TableRow> + <TextView android:text="anyRtl" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="serif" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_hebrew_text" + android:textDirection="anyRtl" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_latin_text" + android:textDirection="anyRtl" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_multiline_text" + android:textDirection="anyRtl" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + </TableRow> + + <TableRow> + <TextView android:text="ltr" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="serif" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_hebrew_text" + android:textDirection="ltr" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_latin_text" + android:textDirection="ltr" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_multiline_text" + android:textDirection="ltr" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + </TableRow> + + <TableRow> + <TextView android:text="rtl" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="serif" + android:layout_marginRight="7dip" + android:layout_marginLeft="7dip" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_hebrew_text" + android:textDirection="rtl" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_latin_text" + android:textDirection="rtl" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_multiline_text" + android:textDirection="rtl" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + </TableRow> - </LinearLayout> + </TableLayout> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/tests/BiDiTests/res/layout/textview_direction_rtl.xml b/tests/BiDiTests/res/layout/textview_direction_rtl.xml index 81c5411..1df100d 100644 --- a/tests/BiDiTests/res/layout/textview_direction_rtl.xml +++ b/tests/BiDiTests/res/layout/textview_direction_rtl.xml @@ -18,95 +18,232 @@ android:id="@+id/textview_direction_rtl" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layoutDirection="rtl"> + android:layoutDirection="rtl" + android:textDirection="rtl"> - <LinearLayout android:orientation="vertical" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textDirection="rtl"> - - <LinearLayout android:orientation="vertical" + <TableLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_text" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_text" - android:textDirection="inherit" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_text" - android:textDirection="firstStrong" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_text" - android:textDirection="anyRtl" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_text" - android:textDirection="ltr" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_text" - android:textDirection="rtl" - /> - </LinearLayout> + <TableRow> + <TextView android:text="(unspecified)" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="serif" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_hebrew_text" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_latin_text" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_multiline_text" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + </TableRow> - <LinearLayout android:orientation="vertical" - android:layout_width="wrap_content" - android:layout_height="wrap_content"> + <TableRow> + <TextView android:text="inherit" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="serif" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_hebrew_text" + android:textDirection="inherit" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_latin_text" + android:textDirection="inherit" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_multiline_text" + android:textDirection="inherit" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + </TableRow> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_hebrew_text" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_hebrew_text" - android:textDirection="inherit" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_hebrew_text" - android:textDirection="firstStrong" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_hebrew_text" - android:textDirection="anyRtl" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_hebrew_text" - android:textDirection="ltr" - /> - <TextView android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textSize="24dip" - android:text="@string/textview_hebrew_text" - android:textDirection="rtl" - /> - </LinearLayout> + <TableRow> + <TextView android:text="firstStrong" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="serif" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_hebrew_text" + android:textDirection="firstStrong" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_latin_text" + android:textDirection="firstStrong" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_multiline_text" + android:textDirection="firstStrong" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + </TableRow> + + <TableRow> + <TextView android:text="anyRtl" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="serif" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_hebrew_text" + android:textDirection="anyRtl" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_latin_text" + android:textDirection="anyRtl" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_multiline_text" + android:textDirection="anyRtl" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + </TableRow> + + <TableRow> + <TextView android:text="ltr" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="serif" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_hebrew_text" + android:textDirection="ltr" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_latin_text" + android:textDirection="ltr" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_multiline_text" + android:textDirection="ltr" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + </TableRow> + + <TableRow> + <TextView android:text="rtl" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="serif" + android:layout_marginRight="7dip" + android:layout_marginLeft="7dip" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_hebrew_text" + android:textDirection="rtl" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_latin_text" + android:textDirection="rtl" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + <TextView android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="24dip" + android:text="@string/textview_multiline_text" + android:textDirection="rtl" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" + android:background="#444444" + /> + </TableRow> - </LinearLayout> + </TableLayout> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/tests/BiDiTests/res/values/strings.xml b/tests/BiDiTests/res/values/strings.xml index c0bbe94..bc99e79 100644 --- a/tests/BiDiTests/res/values/strings.xml +++ b/tests/BiDiTests/res/values/strings.xml @@ -23,6 +23,7 @@ <string name="button_left_text">Left</string> <string name="button_before_text">Start</string> <string name="button_requestlayout_text">Request Layout</string> + <string name="button_alert_dialog_text">AlertDialog</string> <string name="textview_text">This is a text for a TextView</string> <string name="edittext_text">mmmmmmmmmmmmmmmmmmmmmmmm</string> <string name="normal_text">Normal String</string> @@ -40,6 +41,6 @@ <string name="menu_delete">Delete</string> <string name="textview_hebrew_text">םמab?!</string> <string name="textview_latin_text">abםמ?!</string> - <string name="textview_multiline_text">םמ?!\nab?!</string> + <string name="textview_multiline_text">םמ?!\nab?!\n?!</string> </resources> diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestBasic.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestBasic.java index 9b3918d..f0b7438 100644 --- a/tests/BiDiTests/src/com/android/bidi/BiDiTestBasic.java +++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestBasic.java @@ -16,17 +16,42 @@ package com.android.bidi; +import android.app.AlertDialog; import android.app.Fragment; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; public class BiDiTestBasic extends Fragment { - + + private View currentView; + private Button alertDialogButton; + private String[] items = {"This is a very very very very very very very very very very very long Item1", "Item2"}; + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.basic, container, false); + currentView = inflater.inflate(R.layout.basic, container, false); + return currentView; + } + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + alertDialogButton = (Button) currentView.findViewById(R.id.button_alert_dialog); + alertDialogButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + showDialog(); + } + }); + } + + private void showDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(currentView.getContext()); + builder.setSingleChoiceItems(items, 0, null); + builder.show(); } } |