Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f531a800 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Update BiDiTest app for adding GridLayout unit tests"

parents c70969ea bf2ab0b8

tests/BiDiTests/res/layout/grid_layout_locale.xml

0 → 100644
+74 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 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.

-->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/grid_layout_locale"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent">





    <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:useDefaultMargins="true"

            android:alignmentMode="alignBounds"

            android:columnOrderPreserved="false"

            android:columnCount="4"

            android:layoutDirection="locale">



        <TextView

                android:text="Email setup"

                android:textSize="32dip"



                android:layout_columnSpan="4"

                android:layout_gravity="center_horizontal"/>



        <TextView

                android:text="You can configure email in just a few steps:"

                android:textSize="16dip"

                android:layout_columnSpan="4"

                android:layout_gravity="left"/>



        <TextView

                android:text="Email address:"

                android:layout_gravity="right"/>



        <EditText

                android:ems="10"/>



        <TextView

                android:text="Password:"

                android:layout_column="0"

                android:layout_gravity="right"/>



        <EditText

                android:ems="8"/>



        <Space

                android:layout_row="4"

                android:layout_column="0"

                android:layout_columnSpan="3"

                android:layout_gravity="fill"

                />



        <Button

                android:text="Next"

                android:layout_row="5"

                android:layout_column="3"/>



    </GridLayout>



</FrameLayout>
 
 No newline at end of file

tests/BiDiTests/res/layout/grid_layout_ltr.xml

0 → 100644
+74 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 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.

-->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/grid_layout_ltr"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent">





    <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:useDefaultMargins="true"

            android:alignmentMode="alignBounds"

            android:columnOrderPreserved="false"

            android:columnCount="4"

            android:layoutDirection="ltr">



        <TextView

                android:text="Email setup"

                android:textSize="32dip"



                android:layout_columnSpan="4"

                android:layout_gravity="center_horizontal"/>



        <TextView

                android:text="You can configure email in just a few steps:"

                android:textSize="16dip"

                android:layout_columnSpan="4"

                android:layout_gravity="left"/>



        <TextView

                android:text="Email address:"

                android:layout_gravity="right"/>



        <EditText

                android:ems="10"/>



        <TextView

                android:text="Password:"

                android:layout_column="0"

                android:layout_gravity="right"/>



        <EditText

                android:ems="8"/>



        <Space

                android:layout_row="4"

                android:layout_column="0"

                android:layout_columnSpan="3"

                android:layout_gravity="fill"

                />



        <Button

                android:text="Next"

                android:layout_row="5"

                android:layout_column="3"/>



    </GridLayout>



</FrameLayout>
 
 No newline at end of file

tests/BiDiTests/res/layout/grid_layout_rtl.xml

0 → 100644
+74 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 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.

-->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/grid_layout_rtl"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent">





    <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:useDefaultMargins="true"

            android:alignmentMode="alignBounds"

            android:columnOrderPreserved="false"

            android:columnCount="4"

            android:layoutDirection="rtl">



        <TextView

                android:text="Email setup"

                android:textSize="32dip"



                android:layout_columnSpan="4"

                android:layout_gravity="center_horizontal"/>



        <TextView

                android:text="You can configure email in just a few steps:"

                android:textSize="16dip"

                android:layout_columnSpan="4"

                android:layout_gravity="left"/>



        <TextView

                android:text="Email address:"

                android:layout_gravity="right"/>



        <EditText

                android:ems="10"/>



        <TextView

                android:text="Password:"

                android:layout_column="0"

                android:layout_gravity="right"/>



        <EditText

                android:ems="8"/>



        <Space

                android:layout_row="4"

                android:layout_column="0"

                android:layout_columnSpan="3"

                android:layout_gravity="fill"

                />



        <Button

                android:text="Next"

                android:layout_row="5"

                android:layout_column="3"/>



    </GridLayout>



</FrameLayout>
 
 No newline at end of file

tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ public class BiDiTestActivity extends Activity { 
        addItem(result, "Linear RTL", BiDiTestLinearLayoutRtl.class, R.id.linear_layout_rtl);

        addItem(result, "Linear LOC", BiDiTestLinearLayoutLocale.class, R.id.linear_layout_locale);



        addItem(result, "Grid LTR", BiDiTestGridLayoutLtr.class, R.id.grid_layout_ltr);

        addItem(result, "Grid RTL", BiDiTestGridLayoutRtl.class, R.id.grid_layout_rtl);

        addItem(result, "Grid LOC", BiDiTestGridLayoutLocale.class, R.id.grid_layout_locale);



        addItem(result, "Frame LTR", BiDiTestFrameLayoutLtr.class, R.id.frame_layout_ltr);

        addItem(result, "Frame RTL", BiDiTestFrameLayoutRtl.class, R.id.frame_layout_rtl);

        addItem(result, "Frame LOC", BiDiTestFrameLayoutLocale.class, R.id.frame_layout_locale);

tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutLocale.java

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 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.

 */



package com.android.bidi;



import android.app.Fragment;

import android.os.Bundle;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;



public class BiDiTestGridLayoutLocale extends Fragment {



    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        return inflater.inflate(R.layout.grid_layout_locale, container, false);

    }

}