Merge "add timeout per package for PTS" into jb-mr1-dev
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index a8cb020..7962b34 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -300,7 +300,7 @@
<meta-data android:name="test_required_features" android:value="android.hardware.camera"/>
</activity>
-
+<!-- Experimental
<activity android:name=".camera.analyzer.CameraAnalyzerActivity"
android:label="@string/camera_analyzer"
android:screenOrientation="landscape">
@@ -316,7 +316,7 @@
<meta-data android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
android:resource="@xml/accessory_filter_adk" />
</activity>
-
+-->
<activity android:name=".usb.UsbAccessoryTestActivity"
android:label="@string/usb_accessory_test"
android:configChanges="keyboardHidden|orientation">
diff --git a/suite/audio_quality/lib/include/Log.h b/suite/audio_quality/lib/include/Log.h
index e3e803c..d7520f0 100644
--- a/suite/audio_quality/lib/include/Log.h
+++ b/suite/audio_quality/lib/include/Log.h
@@ -59,7 +59,7 @@
#define LOGD(x...) do { Log::Instance()->printf(Log::ELogD, x); } while(0)
#define LOGV(x...) do { Log::Instance()->printf(Log::ELogV, x); } while(0)
-#define MSG(x...) do { Log::Instance()->printf(Log::ELogW, x); } while(0)
+#define MSG(x...) do { Log::Instance()->printf(Log::ELogE, x); } while(0)
#define ASSERT(cond) if(!(cond)) { Log::Instance()->printf(Log::ELogE, \
"assertion failed %s %d", __FILE__, __LINE__); \
diff --git a/suite/audio_quality/lib/src/BuiltinProcessing.cpp b/suite/audio_quality/lib/src/BuiltinProcessing.cpp
index 49815ce..697ce8e 100644
--- a/suite/audio_quality/lib/src/BuiltinProcessing.cpp
+++ b/suite/audio_quality/lib/src/BuiltinProcessing.cpp
@@ -63,10 +63,10 @@
TaskGeneric::ExecutionResult result = TaskGeneric::EResultOK;
if (rms < passMin) {
- LOGW("Volume %lld low compared to min %lld max %lld", rms, passMin, passMax);
+ MSG("Volume %lld low compared to min %lld max %lld", rms, passMin, passMax);
mRMSPasses = 0;
} else if (rms <= passMax) {
- LOGW("Volume %lld OK compared to min %lld max %lld", rms, passMin, passMax);
+ MSG("Volume %lld OK compared to min %lld max %lld", rms, passMin, passMax);
mRMSPasses++;
if (mRMSPasses >= RMS_CONTINUOUS_PASSES) {
//mRMSPasses = 0;
diff --git a/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java b/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
index 9c13fe1..30c78a8 100644
--- a/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
@@ -22,7 +22,6 @@
import android.content.res.Configuration;
import android.os.Parcel;
import android.test.AndroidTestCase;
-import android.util.LocaleUtil;
import android.view.View;
public class ConfigurationTest extends AndroidTestCase {
diff --git a/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingTest.java b/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingTest.java
index 7e06697..3aa8f35 100644
--- a/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingTest.java
+++ b/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingTest.java
@@ -401,9 +401,9 @@
char[] digitCharacters = new char[] {'0', '\u0660', '\u06F0', '\u0966', '\uFF10'};
for (char c : classISCharacters) {
- // .,:; are class IS breakpoints...
+ // .,:; are class IS breakpoints... (but still shouldn't break alphabetic chars)
// 01234567
- layout(replace("L XXX#X", '#', c), new int[] {6});
+ layout(replace("L XXX#X", '#', c), new int[] {2});
layout(replace("L XXXX#X", '#', c), new int[] {2});
// ...except when adjacent to digits
diff --git a/tests/tests/text/src/android/text/cts/TextUtilsTest.java b/tests/tests/text/src/android/text/cts/TextUtilsTest.java
index 5ae1ef5..157f146 100755
--- a/tests/tests/text/src/android/text/cts/TextUtilsTest.java
+++ b/tests/tests/text/src/android/text/cts/TextUtilsTest.java
@@ -27,24 +27,28 @@
import android.os.Parcelable;
import android.test.AndroidTestCase;
import android.text.GetChars;
-import android.text.Spannable;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.SpannedString;
import android.text.TextPaint;
import android.text.TextUtils;
-import android.text.TextUtils.EllipsizeCallback;
import android.text.TextUtils.TruncateAt;
import android.text.style.BackgroundColorSpan;
import android.text.style.ReplacementSpan;
import android.text.style.TextAppearanceSpan;
import android.text.style.URLSpan;
import android.util.StringBuilderPrinter;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetNew;
import java.util.ArrayList;
+import java.util.Locale;
import java.util.regex.Pattern;
+import static android.view.View.LAYOUT_DIRECTION_LTR;
+import static android.view.View.LAYOUT_DIRECTION_RTL;
+
/**
* Test {@link TextUtils}.
*/
@@ -2026,4 +2030,174 @@
TextUtils.dumpSpans(spanned, printer, prefix);
assertTrue(builder.length() > 0);
}
-}
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getLayoutDirectionFromLocale",
+ args = {Locale.class}
+ )
+ public void testGetLayoutDirectionFromLocale() {
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(null));
+
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.ENGLISH));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.CANADA));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.CANADA_FRENCH));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.FRANCE));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.FRENCH));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.GERMAN));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.GERMANY));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.ITALIAN));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.ITALY));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.UK));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.US));
+
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.ROOT));
+
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.CHINA));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.CHINESE));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.JAPAN));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.JAPANESE));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.KOREA));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.KOREAN));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.PRC));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.SIMPLIFIED_CHINESE));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.TAIWAN));
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(Locale.TRADITIONAL_CHINESE));
+
+ Locale locale = new Locale("ar");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "AE");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "BH");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "DZ");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "EG");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "IQ");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "JO");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "KW");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "LB");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "LY");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "MA");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "OM");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "QA");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "SA");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "SD");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "SY");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "TN");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ar", "YE");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+
+ locale = new Locale("fa");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("fa", "AF");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("fa", "IR");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+
+ locale = new Locale("iw");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("iw", "IL");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("he");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("he", "IL");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+
+ locale = new Locale("pa_Arab");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("pa_Arab", "PK");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+
+ locale = new Locale("ps");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ps", "AF");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+
+ locale = new Locale("ur");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ur", "IN");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("ur", "PK");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+
+ locale = new Locale("uz_Arab");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ locale = new Locale("uz_Arab", "AF");
+ assertEquals(LAYOUT_DIRECTION_RTL,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+
+ // Locale without a real language
+ locale = new Locale("zz");
+ assertEquals(LAYOUT_DIRECTION_LTR,
+ TextUtils.getLayoutDirectionFromLocale(locale));
+ }}
diff --git a/tests/tests/view/src/android/view/cts/LocaleUtilTest.java b/tests/tests/view/src/android/view/cts/LocaleUtilTest.java
deleted file mode 100644
index d80ebbe..0000000
--- a/tests/tests/view/src/android/view/cts/LocaleUtilTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * 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 android.view.cts;
-
-import android.test.AndroidTestCase;
-import android.util.LocaleUtil;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetNew;
-
-import java.util.Locale;
-
-import static android.view.View.LAYOUT_DIRECTION_LTR;
-import static android.view.View.LAYOUT_DIRECTION_RTL;
-
-/**
- * Test {@link LocaleUtil}.
- */
-public class LocaleUtilTest extends AndroidTestCase {
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getLayoutDirectionFromLocale",
- args = {Locale.class}
- )
- public void testGetLayoutDirectionFromLocale() {
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(null));
-
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.ENGLISH));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.CANADA));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.CANADA_FRENCH));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.FRANCE));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.FRENCH));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.GERMAN));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.GERMANY));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.ITALIAN));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.ITALY));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.UK));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.US));
-
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.ROOT));
-
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.CHINA));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.CHINESE));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.JAPAN));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.JAPANESE));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.KOREA));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.KOREAN));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.PRC));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.SIMPLIFIED_CHINESE));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.TAIWAN));
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(Locale.TRADITIONAL_CHINESE));
-
- Locale locale = new Locale("ar");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "AE");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "BH");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "DZ");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "EG");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "IQ");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "JO");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "KW");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "LB");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "LY");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "MA");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "OM");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "QA");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "SA");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "SD");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "SY");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "TN");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ar", "YE");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
-
- locale = new Locale("fa");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("fa", "AF");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("fa", "IR");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
-
- locale = new Locale("iw");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("iw", "IL");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("he");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("he", "IL");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
-
- locale = new Locale("pa_Arab");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("pa_Arab", "PK");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
-
- locale = new Locale("ps");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ps", "AF");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
-
- locale = new Locale("ur");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ur", "IN");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("ur", "PK");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
-
- locale = new Locale("uz_Arab");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- locale = new Locale("uz_Arab", "AF");
- assertEquals(LAYOUT_DIRECTION_RTL,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
-
- // Locale without a real language
- locale = new Locale("zz");
- assertEquals(LAYOUT_DIRECTION_LTR,
- LocaleUtil.getLayoutDirectionFromLocale(locale));
- }
-}
\ No newline at end of file