diff options
| -rw-r--r-- | tests/BiDiTests/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | tests/BiDiTests/res/layout/view_padding_mixed.xml | 47 | ||||
| -rw-r--r-- | tests/BiDiTests/res/menu/main_menu.xml | 28 | ||||
| -rw-r--r-- | tests/BiDiTests/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java | 9 |
5 files changed, 87 insertions, 2 deletions
diff --git a/tests/BiDiTests/AndroidManifest.xml b/tests/BiDiTests/AndroidManifest.xml index 4a687f2..c60edd8 100644 --- a/tests/BiDiTests/AndroidManifest.xml +++ b/tests/BiDiTests/AndroidManifest.xml @@ -30,5 +30,6 @@ </activity> </application> - + <uses-sdk android:minSdkVersion="10" + android:targetSdkVersion="10"/> </manifest> diff --git a/tests/BiDiTests/res/layout/view_padding_mixed.xml b/tests/BiDiTests/res/layout/view_padding_mixed.xml index 092f55b..c916ffb 100644 --- a/tests/BiDiTests/res/layout/view_padding_mixed.xml +++ b/tests/BiDiTests/res/layout/view_padding_mixed.xml @@ -20,7 +20,8 @@ android:layout_height="fill_parent"> <FrameLayout android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:background="#FFFFFFFF"> <FrameLayout android:layout_width="300dp" @@ -79,6 +80,28 @@ <FrameLayout android:layout_width="300dp" android:layout_height="300dp" + android:layout_gravity="top|right" + android:background="@*android:drawable/dialog_full_holo_dark" + 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="#FFFFFFFF"> + </FrameLayout> + </FrameLayout> + + <FrameLayout + android:layout_width="300dp" + android:layout_height="300dp" android:layout_gravity="bottom|left" android:background="#FF888888" android:paddingTop="20dip" @@ -130,6 +153,28 @@ </FrameLayout> </FrameLayout> + <FrameLayout + android:layout_width="300dp" + android:layout_height="300dp" + android:layout_gravity="bottom|right" + android:background="@*android:drawable/menu_background_fill_parent_width" + 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="#FFFFFFFF"> + </FrameLayout> + </FrameLayout> + </FrameLayout> </FrameLayout> diff --git a/tests/BiDiTests/res/menu/main_menu.xml b/tests/BiDiTests/res/menu/main_menu.xml new file mode 100644 index 0000000..a7fe28a --- /dev/null +++ b/tests/BiDiTests/res/menu/main_menu.xml @@ -0,0 +1,28 @@ +<?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. +--> + +<menu xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/main_menu"> + + <item android:id="@+id/menu_add" + android:icon="@android:drawable/ic_menu_add" + android:title="@string/menu_add" /> + + <item android:id="@+id/menu_delete" + android:icon="@android:drawable/ic_menu_delete" + android:title="@string/menu_delete" /> + +</menu>
\ No newline at end of file diff --git a/tests/BiDiTests/res/values/strings.xml b/tests/BiDiTests/res/values/strings.xml index d067e7d..16dc263 100644 --- a/tests/BiDiTests/res/values/strings.xml +++ b/tests/BiDiTests/res/values/strings.xml @@ -36,4 +36,6 @@ <string name="bold_italic_text">Bold Italic String</string> <string name="mixed_text_1">he said in Arabic: لا. Wow this is cool</string> <string name="hebrew_text">םמ</string> + <string name="menu_add">Add</string> + <string name="menu_delete">Delete</string> </resources>
\ No newline at end of file diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java index c5e2273..bee1881 100644 --- a/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java +++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java @@ -25,6 +25,8 @@ import android.app.Activity; import android.app.Fragment; import android.app.FragmentTransaction; import android.os.Bundle; +import android.view.Menu; +import android.view.MenuInflater; import android.view.View; import android.widget.AdapterView; import android.widget.ListView; @@ -124,4 +126,11 @@ public class BiDiTestActivity extends Activity { return result; } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.main_menu, menu); + return true; + } }
\ No newline at end of file |