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

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

Merge "Add unit tests for bug #5037425 Canvas.drawText can't handle... 

Merge "Add unit tests for bug #5037425 Canvas.drawText can't handle Right-to-Left text and text composing"
parents b4569fb1 c6f247ca

tests/BiDiTests/res/layout/canvas2.xml

0 → 100644
+63 −0
Original line number Diff line number Diff line 
<?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.

-->



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

        android:id="@+id/canvas2"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent">



    <LinearLayout

        xmlns:local="http://schemas.android.com/apk/res/com.android.bidi"

        android:orientation="vertical"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent">



        <TextView

            android:text="@string/ltr"

            android:gravity="center"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content" />



        <com.android.bidi.DrawTextTestView

            local:text="@string/ltr"

            android:layout_width="fill_parent"

            android:layout_height="40dp" />



        <TextView

            android:text="@string/rtl"

            android:gravity="center"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"/>



        <com.android.bidi.DrawTextTestView

            local:text="@string/rtl"

            android:layout_width="fill_parent"

            android:layout_height="40dp" />



        <TextView

            android:text="@string/composing"

            android:gravity="center"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"/>



        <com.android.bidi.DrawTextTestView

            local:text="@string/composing"

            android:layout_width="fill_parent"

            android:layout_height="40dp" />



    </LinearLayout>



</FrameLayout>
 
 No newline at end of file

tests/BiDiTests/res/values/attrs.xml

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

<resources>

    <declare-styleable name="DrawTextTestView">

        <attr name="size" format="dimension" />

        <attr name="color" format="color" />

        <attr name="text" format="string" />

    </declare-styleable>

</resources>
 
 No newline at end of file

tests/BiDiTests/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -42,5 +42,8 @@ 
    <string name="textview_hebrew_text">&#x05DD;&#x05DE;ab?!</string>

    <string name="textview_latin_text">ab&#x05DD;&#x05DE;?!</string>

    <string name="textview_multiline_text">&#x05DD;&#x05DE;?!\nab?!\n?!</string>

    <string name="ltr">Left to right text"</string>

    <string name="rtl">"والحق أن تترك ونص"</string>

    <string name="composing">"\u0644\u0627"</string>

</resources>

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

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ public class BiDiTestActivity extends Activity { 
        addItem(result, "Basic", BiDiTestBasic.class, R.id.basic);



        addItem(result, "Canvas", BiDiTestCanvas.class, R.id.canvas);

        addItem(result, "Canvas2", BiDiTestCanvas2.class, R.id.canvas2);



        addItem(result, "Linear LTR", BiDiTestLinearLayoutLtr.class, R.id.linear_layout_ltr);

        addItem(result, "Linear RTL", BiDiTestLinearLayoutRtl.class, R.id.linear_layout_rtl);

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

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

 * 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.

 */



package com.android.bidi;



import android.app.Fragment;

import android.os.Bundle;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.SeekBar;



import static com.android.bidi.BiDiTestConstants.FONT_MAX_SIZE;

import static com.android.bidi.BiDiTestConstants.FONT_MIN_SIZE;



public class BiDiTestCanvas2 extends Fragment {



    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

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

    }

}