am 5ae4c7de: Merge "Hide RTL related APIs - DO NOT MERGE" into jb-dev
* commit '5ae4c7de3dae3e6446726138ea553f2099f67f84':
Hide RTL related APIs - DO NOT MERGE
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 2858973..1fde1ab 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -118,8 +118,7 @@
<application android:label="Android TestCase"
android:icon="@drawable/size_48x48"
- android:name="android.app.cts.MockApplication"
- android:supportsRtl="true">
+ android:name="android.app.cts.MockApplication">
<activity android:name="android.app.cts.ActionBarActivity" />
@@ -275,14 +274,6 @@
</intent-filter>
</activity>
- <activity android:name="android.widget.cts.LayoutDirectionStubActivity"
- android:label="LayoutDirectionStubActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
- </intent-filter>
- </activity>
-
<activity android:name="android.widget.cts.ProgressBarStubActivity"
android:label="ProgressBarStubActivity">
<intent-filter>
diff --git a/tests/res/layout/layoutdirection_layout.xml b/tests/res/layout/layoutdirection_layout.xml
deleted file mode 100644
index e506dc1..0000000
--- a/tests/res/layout/layoutdirection_layout.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?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.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <LinearLayout android:id="@+id/layout_linearlayout_ltr"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="ltr">
-
- <LinearLayout android:id="@+id/layout_linearlayout_ltr_child_1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="ltr" />
-
- <LinearLayout android:id="@+id/layout_linearlayout_ltr_child_2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="rtl" />
-
- <LinearLayout android:id="@+id/layout_linearlayout_ltr_child_3"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="inherit" />
-
- <LinearLayout android:id="@+id/layout_linearlayout_ltr_child_4"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="locale" />
-
- </LinearLayout>
-
- <LinearLayout android:id="@+id/layout_linearlayout_rtl"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="rtl">
-
- <LinearLayout android:id="@+id/layout_linearlayout_rtl_child_1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="ltr" />
-
- <LinearLayout android:id="@+id/layout_linearlayout_rtl_child_2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="rtl" />
-
- <LinearLayout android:id="@+id/layout_linearlayout_rtl_child_3"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="inherit" />
-
- <LinearLayout android:id="@+id/layout_linearlayout_rtl_child_4"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="locale" />
-
- </LinearLayout>
-
- <LinearLayout android:id="@+id/layout_linearlayout_locale"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="locale">
-
- <LinearLayout android:id="@+id/layout_linearlayout_locale_child_1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="ltr" />
-
- <LinearLayout android:id="@+id/layout_linearlayout_locale_child_2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="rtl" />
-
- <LinearLayout android:id="@+id/layout_linearlayout_locale_child_3"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="inherit" />
-
- <LinearLayout android:id="@+id/layout_linearlayout_locale_child_4"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="locale" />
-
- </LinearLayout>
-
- <LinearLayout android:id="@+id/layout_linearlayout_inherit"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="inherit">
-
- <LinearLayout android:id="@+id/layout_linearlayout_inherit_child_1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="ltr" />
-
- <LinearLayout android:id="@+id/layout_linearlayout_inherit_child_2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="rtl" />
-
- <LinearLayout android:id="@+id/layout_linearlayout_inherit_child_3"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="inherit" />
-
- <LinearLayout android:id="@+id/layout_linearlayout_inherit_child_4"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layoutDirection="locale" />
-
- </LinearLayout>
-
-</LinearLayout>
diff --git a/tests/src/android/widget/cts/LayoutDirectionStubActivity.java b/tests/src/android/widget/cts/LayoutDirectionStubActivity.java
deleted file mode 100644
index 66f24f7..0000000
--- a/tests/src/android/widget/cts/LayoutDirectionStubActivity.java
+++ /dev/null
@@ -1,32 +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.widget.cts;
-
-import android.app.Activity;
-import android.os.Bundle;
-import com.android.cts.stub.R;
-
-/**
- * A minimal application for layout direction test.
- */
-public class LayoutDirectionStubActivity extends Activity {
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.layoutdirection_layout);
- }
-}
diff --git a/tests/tests/accessibilityservice/res/layout/accessibility_focus_and_input_focus_sync_test.xml b/tests/tests/accessibilityservice/res/layout/accessibility_focus_and_input_focus_sync_test.xml
index 09a27e4..bccb563 100644
--- a/tests/tests/accessibilityservice/res/layout/accessibility_focus_and_input_focus_sync_test.xml
+++ b/tests/tests/accessibilityservice/res/layout/accessibility_focus_and_input_focus_sync_test.xml
@@ -20,7 +20,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layoutDirection="ltr"
android:contentDescription="@string/firstLinearLayout" >
<TextView
@@ -56,7 +55,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layoutDirection="rtl"
android:contentDescription="@string/secondLinearLayout"
android:clickable="true"
android:importantForAccessibility="no" >
diff --git a/tests/tests/accessibilityservice/res/layout/accessibility_view_tree_reporting_test.xml b/tests/tests/accessibilityservice/res/layout/accessibility_view_tree_reporting_test.xml
index bd18a84..bccb563 100644
--- a/tests/tests/accessibilityservice/res/layout/accessibility_view_tree_reporting_test.xml
+++ b/tests/tests/accessibilityservice/res/layout/accessibility_view_tree_reporting_test.xml
@@ -4,7 +4,6 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
- android:layoutDirection="rtl"
android:importantForAccessibility="yes"
android:contentDescription="@string/rootLinearLayout">
@@ -21,7 +20,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layoutDirection="ltr"
android:contentDescription="@string/firstLinearLayout" >
<TextView
@@ -57,7 +55,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layoutDirection="rtl"
android:contentDescription="@string/secondLinearLayout"
android:clickable="true"
android:importantForAccessibility="no" >
diff --git a/tests/tests/view/src/android/view/cts/GravityTest.java b/tests/tests/view/src/android/view/cts/GravityTest.java
index 86b1283..86bbb2c 100644
--- a/tests/tests/view/src/android/view/cts/GravityTest.java
+++ b/tests/tests/view/src/android/view/cts/GravityTest.java
@@ -16,7 +16,6 @@
package android.view.cts;
-import android.test.suitebuilder.annotation.SmallTest;
import android.view.View;
import android.graphics.Rect;
@@ -289,55 +288,4 @@
assertEquals(30, inoutRect.top);
assertEquals(50, inoutRect.bottom);
}
-
- @SmallTest
- public void testGetAbsoluteGravity() throws Exception {
- assertOneGravity(Gravity.LEFT, Gravity.LEFT, false);
- assertOneGravity(Gravity.LEFT, Gravity.LEFT, true);
-
- assertOneGravity(Gravity.RIGHT, Gravity.RIGHT, false);
- assertOneGravity(Gravity.RIGHT, Gravity.RIGHT, true);
-
- assertOneGravity(Gravity.TOP, Gravity.TOP, false);
- assertOneGravity(Gravity.TOP, Gravity.TOP, true);
-
- assertOneGravity(Gravity.BOTTOM, Gravity.BOTTOM, false);
- assertOneGravity(Gravity.BOTTOM, Gravity.BOTTOM, true);
-
- assertOneGravity(Gravity.CENTER_VERTICAL, Gravity.CENTER_VERTICAL, false);
- assertOneGravity(Gravity.CENTER_VERTICAL, Gravity.CENTER_VERTICAL, true);
-
- assertOneGravity(Gravity.CENTER_HORIZONTAL, Gravity.CENTER_HORIZONTAL, false);
- assertOneGravity(Gravity.CENTER_HORIZONTAL, Gravity.CENTER_HORIZONTAL, true);
-
- assertOneGravity(Gravity.CENTER, Gravity.CENTER, false);
- assertOneGravity(Gravity.CENTER, Gravity.CENTER, true);
-
- assertOneGravity(Gravity.FILL_VERTICAL, Gravity.FILL_VERTICAL, false);
- assertOneGravity(Gravity.FILL_VERTICAL, Gravity.FILL_VERTICAL, true);
-
- assertOneGravity(Gravity.FILL_HORIZONTAL, Gravity.FILL_HORIZONTAL, false);
- assertOneGravity(Gravity.FILL_HORIZONTAL, Gravity.FILL_HORIZONTAL, true);
-
- assertOneGravity(Gravity.FILL, Gravity.FILL, false);
- assertOneGravity(Gravity.FILL, Gravity.FILL, true);
-
- assertOneGravity(Gravity.CLIP_HORIZONTAL, Gravity.CLIP_HORIZONTAL, false);
- assertOneGravity(Gravity.CLIP_HORIZONTAL, Gravity.CLIP_HORIZONTAL, true);
-
- assertOneGravity(Gravity.CLIP_VERTICAL, Gravity.CLIP_VERTICAL, false);
- assertOneGravity(Gravity.CLIP_VERTICAL, Gravity.CLIP_VERTICAL, true);
-
- assertOneGravity(Gravity.LEFT, Gravity.START, false);
- assertOneGravity(Gravity.RIGHT, Gravity.START, true);
-
- assertOneGravity(Gravity.RIGHT, Gravity.END, false);
- assertOneGravity(Gravity.LEFT, Gravity.END, true);
- }
-
- private void assertOneGravity(int expected, int initial, boolean isRtl) {
- final int layoutDirection = isRtl ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR;
-
- assertEquals(expected, Gravity.getAbsoluteGravity(initial, layoutDirection));
- }
}
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 5be1f99..0000000
--- a/tests/tests/view/src/android/view/cts/LocaleUtilTest.java
+++ /dev/null
@@ -1,205 +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));
-
-// TODO: uncomment when ICU is fixed (4.8.1.1 version of ICS broke the following unit tests)
-// 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
diff --git a/tests/tests/widget/src/android/widget/cts/LayoutDirectionTest.java b/tests/tests/widget/src/android/widget/cts/LayoutDirectionTest.java
deleted file mode 100644
index 2c4c798..0000000
--- a/tests/tests/widget/src/android/widget/cts/LayoutDirectionTest.java
+++ /dev/null
@@ -1,179 +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.widget.cts;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.view.ViewGroup;
-import android.widget.*;
-import com.android.cts.stub.R;
-
-import static android.view.View.LAYOUT_DIRECTION_LTR;
-import static android.view.View.LAYOUT_DIRECTION_RTL;
-import static android.view.View.LAYOUT_DIRECTION_INHERIT;
-import static android.view.View.LAYOUT_DIRECTION_LOCALE;
-
-public class LayoutDirectionTest extends ActivityInstrumentationTestCase2<LayoutDirectionStubActivity> {
-
- public LayoutDirectionTest() {
- super(LayoutDirectionStubActivity.class);
- }
-
- private void checkDefaultDirectionForOneLayoutWithCode(ViewGroup vg) {
- assertEquals(LAYOUT_DIRECTION_INHERIT, vg.getLayoutDirection());
- assertEquals(LAYOUT_DIRECTION_LTR, vg.getResolvedLayoutDirection());
- }
-
- @UiThreadTest
- public void testLayoutDirectionDefaults() {
- checkDefaultDirectionForOneLayoutWithCode(new LinearLayout(getActivity()));
- checkDefaultDirectionForOneLayoutWithCode(new FrameLayout(getActivity()));
- checkDefaultDirectionForOneLayoutWithCode(new TableLayout(getActivity()));
- checkDefaultDirectionForOneLayoutWithCode(new RelativeLayout(getActivity()));
- checkDefaultDirectionForOneLayoutWithCode(new GridLayout(getActivity()));
- }
-
- private void checkDirectionForOneLayoutWithCode(ViewGroup vg) {
- vg.setLayoutDirection(LAYOUT_DIRECTION_LTR);
- assertEquals(LAYOUT_DIRECTION_LTR, vg.getLayoutDirection());
- assertEquals(LAYOUT_DIRECTION_LTR, vg.getResolvedLayoutDirection());
-
- vg.setLayoutDirection(LAYOUT_DIRECTION_RTL);
- assertEquals(LAYOUT_DIRECTION_RTL, vg.getLayoutDirection());
- assertEquals(LAYOUT_DIRECTION_RTL, vg.getResolvedLayoutDirection());
-
- vg.setLayoutDirection(LAYOUT_DIRECTION_LOCALE);
- assertEquals(LAYOUT_DIRECTION_LOCALE, vg.getLayoutDirection());
- // running with English locale
- assertEquals(LAYOUT_DIRECTION_LTR, vg.getResolvedLayoutDirection());
-
- vg.setLayoutDirection(LAYOUT_DIRECTION_INHERIT);
- assertEquals(LAYOUT_DIRECTION_INHERIT, vg.getLayoutDirection());
- // default is LTR
- assertEquals(LAYOUT_DIRECTION_LTR, vg.getResolvedLayoutDirection());
- }
-
- @UiThreadTest
- public void testDirectionForAllLayoutsWithCode() {
- checkDirectionForOneLayoutWithCode(new LinearLayout(getActivity()));
- checkDirectionForOneLayoutWithCode(new FrameLayout(getActivity()));
- checkDirectionForOneLayoutWithCode(new TableLayout(getActivity()));
- checkDirectionForOneLayoutWithCode(new RelativeLayout(getActivity()));
- checkDirectionForOneLayoutWithCode(new GridLayout(getActivity()));
- }
-
- private void checkDirectionInheritanceForOneLayoutWithCode(ViewGroup parent) {
- LinearLayout child = new LinearLayout(getActivity());
- child.setLayoutDirection(LAYOUT_DIRECTION_INHERIT);
- parent.addView(child);
-
- // Parent is LTR
- parent.setLayoutDirection(LAYOUT_DIRECTION_LTR);
-
- assertEquals(LAYOUT_DIRECTION_LTR, parent.getLayoutDirection());
- assertEquals(LAYOUT_DIRECTION_LTR, parent.getResolvedLayoutDirection());
-
- assertEquals(LAYOUT_DIRECTION_INHERIT, child.getLayoutDirection());
- assertEquals(LAYOUT_DIRECTION_LTR, child.getResolvedLayoutDirection());
-
- // Parent is RTL
- parent.setLayoutDirection(LAYOUT_DIRECTION_RTL);
-
- assertEquals(LAYOUT_DIRECTION_RTL, parent.getLayoutDirection());
- assertEquals(LAYOUT_DIRECTION_RTL, parent.getResolvedLayoutDirection());
-
- assertEquals(LAYOUT_DIRECTION_INHERIT, child.getLayoutDirection());
- assertEquals(LAYOUT_DIRECTION_RTL, child.getResolvedLayoutDirection());
- }
-
- @UiThreadTest
- public void testDirectionInheritanceForAllLayoutsWithCode() {
- checkDirectionInheritanceForOneLayoutWithCode(new LinearLayout(getActivity()));
- checkDirectionInheritanceForOneLayoutWithCode(new FrameLayout(getActivity()));
- checkDirectionInheritanceForOneLayoutWithCode(new TableLayout(getActivity()));
- checkDirectionInheritanceForOneLayoutWithCode(new RelativeLayout(getActivity()));
- checkDirectionInheritanceForOneLayoutWithCode(new GridLayout(getActivity()));
- }
-
- private void checkDirectionForOneLayoutFromXml(int parentId, int parentDir, int parentResDir,
- int child1Id, int child1Dir, int child1ResDir,
- int child2Id, int child2Dir, int child2ResDir,
- int child3Id, int child3Dir, int child3ResDir,
- int child4Id, int child4Dir, int child4ResDir) {
- ViewGroup ll = (ViewGroup) getActivity().findViewById(parentId);
- assertEquals(parentDir, ll.getLayoutDirection());
- assertEquals(parentResDir, ll.getResolvedLayoutDirection());
-
- ViewGroup child1 = (ViewGroup) getActivity().findViewById(child1Id);
- assertEquals(child1Dir, child1.getLayoutDirection());
- assertEquals(child1ResDir, child1.getResolvedLayoutDirection());
-
- ViewGroup child2 = (ViewGroup) getActivity().findViewById(child2Id);
- assertEquals(child2Dir, child2.getLayoutDirection());
- assertEquals(child2ResDir, child2.getResolvedLayoutDirection());
-
- ViewGroup child3 = (ViewGroup) getActivity().findViewById(child3Id);
- assertEquals(child3Dir, child3.getLayoutDirection());
- assertEquals(child3ResDir, child3.getResolvedLayoutDirection());
-
- ViewGroup child4 = (ViewGroup) getActivity().findViewById(child4Id);
- assertEquals(child4Dir, child4.getLayoutDirection());
- assertEquals(child4ResDir, child4.getResolvedLayoutDirection());
- }
-
- @UiThreadTest
- public void testDirectionFromXml() {
- // We only test LinearLayout as the others would be the same (they extend ViewGroup / View)
- checkDirectionForOneLayoutFromXml(
- R.id.layout_linearlayout_ltr, LAYOUT_DIRECTION_LTR, LAYOUT_DIRECTION_LTR,
- R.id.layout_linearlayout_ltr_child_1, LAYOUT_DIRECTION_LTR, LAYOUT_DIRECTION_LTR,
- R.id.layout_linearlayout_ltr_child_2, LAYOUT_DIRECTION_RTL, LAYOUT_DIRECTION_RTL,
- // parent is LTR
- R.id.layout_linearlayout_ltr_child_3, LAYOUT_DIRECTION_INHERIT, LAYOUT_DIRECTION_LTR,
- // running with English locale
- R.id.layout_linearlayout_ltr_child_4, LAYOUT_DIRECTION_LOCALE, LAYOUT_DIRECTION_LTR);
-
- checkDirectionForOneLayoutFromXml(
- R.id.layout_linearlayout_rtl, LAYOUT_DIRECTION_RTL, LAYOUT_DIRECTION_RTL,
- R.id.layout_linearlayout_rtl_child_1, LAYOUT_DIRECTION_LTR, LAYOUT_DIRECTION_LTR,
- R.id.layout_linearlayout_rtl_child_2, LAYOUT_DIRECTION_RTL, LAYOUT_DIRECTION_RTL,
- // parent is RTL
- R.id.layout_linearlayout_rtl_child_3, LAYOUT_DIRECTION_INHERIT, LAYOUT_DIRECTION_RTL,
- // running with English locale
- R.id.layout_linearlayout_rtl_child_4, LAYOUT_DIRECTION_LOCALE, LAYOUT_DIRECTION_LTR);
-
- checkDirectionForOneLayoutFromXml(
- // default is LTR
- R.id.layout_linearlayout_inherit, LAYOUT_DIRECTION_INHERIT, LAYOUT_DIRECTION_LTR,
- R.id.layout_linearlayout_inherit_child_1, LAYOUT_DIRECTION_LTR, LAYOUT_DIRECTION_LTR,
- R.id.layout_linearlayout_inherit_child_2, LAYOUT_DIRECTION_RTL, LAYOUT_DIRECTION_RTL,
- // parent is LTR
- R.id.layout_linearlayout_inherit_child_3, LAYOUT_DIRECTION_INHERIT, LAYOUT_DIRECTION_LTR,
- // running with English locale
- R.id.layout_linearlayout_inherit_child_4, LAYOUT_DIRECTION_LOCALE, LAYOUT_DIRECTION_LTR);
-
- checkDirectionForOneLayoutFromXml(
- // running with English locale
- R.id.layout_linearlayout_locale, LAYOUT_DIRECTION_LOCALE, LAYOUT_DIRECTION_LTR,
- R.id.layout_linearlayout_locale_child_1, LAYOUT_DIRECTION_LTR, LAYOUT_DIRECTION_LTR,
- R.id.layout_linearlayout_locale_child_2, LAYOUT_DIRECTION_RTL, LAYOUT_DIRECTION_RTL,
- // parent is LTR
- R.id.layout_linearlayout_locale_child_3, LAYOUT_DIRECTION_INHERIT, LAYOUT_DIRECTION_LTR,
- // running with English locale
- R.id.layout_linearlayout_locale_child_4, LAYOUT_DIRECTION_LOCALE, LAYOUT_DIRECTION_LTR);
- }
-}
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index 748b730..d7ce2b5 100755
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -2979,299 +2979,6 @@
outText.text.toString());
}
- @UiThreadTest
- public void testTextDirectionDefault() {
- TextView tv = new TextView(mActivity);
- assertEquals(View.TEXT_DIRECTION_INHERIT, tv.getTextDirection());
- }
-
- @UiThreadTest
- public void testSetGetTextDirection() {
- TextView tv = new TextView(mActivity);
-
- tv.setTextDirection(View.TEXT_DIRECTION_FIRST_STRONG);
- assertEquals(View.TEXT_DIRECTION_FIRST_STRONG, tv.getTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_ANY_RTL);
- assertEquals(View.TEXT_DIRECTION_ANY_RTL, tv.getTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_INHERIT);
- assertEquals(View.TEXT_DIRECTION_INHERIT, tv.getTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_LTR);
- assertEquals(View.TEXT_DIRECTION_LTR, tv.getTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_RTL);
- assertEquals(View.TEXT_DIRECTION_RTL, tv.getTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_LOCALE);
- assertEquals(View.TEXT_DIRECTION_LOCALE, tv.getTextDirection());
- }
-
- @UiThreadTest
- public void testGetResolvedTextDirectionLtr() {
- TextView tv = new TextView(mActivity);
- tv.setText("this is a test");
-
- assertEquals(View.TEXT_DIRECTION_FIRST_STRONG, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_FIRST_STRONG);
- assertEquals(View.TEXT_DIRECTION_FIRST_STRONG, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_ANY_RTL);
- assertEquals(View.TEXT_DIRECTION_ANY_RTL, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_INHERIT);
- assertEquals(View.TEXT_DIRECTION_FIRST_STRONG, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_LTR);
- assertEquals(View.TEXT_DIRECTION_LTR, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_RTL);
- assertEquals(View.TEXT_DIRECTION_RTL, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_LOCALE);
- assertEquals(View.TEXT_DIRECTION_LOCALE, tv.getResolvedTextDirection());
- }
-
- @UiThreadTest
- public void testGetResolvedTextDirectionLtrWithInheritance() {
- LinearLayout ll = new LinearLayout(mActivity);
- ll.setTextDirection(View.TEXT_DIRECTION_ANY_RTL);
-
- TextView tv = new TextView(mActivity);
- tv.setText("this is a test");
- ll.addView(tv);
-
- tv.setTextDirection(View.TEXT_DIRECTION_FIRST_STRONG);
- assertEquals(View.TEXT_DIRECTION_FIRST_STRONG, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_ANY_RTL);
- assertEquals(View.TEXT_DIRECTION_ANY_RTL, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_INHERIT);
- assertEquals(View.TEXT_DIRECTION_ANY_RTL, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_LTR);
- assertEquals(View.TEXT_DIRECTION_LTR, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_RTL);
- assertEquals(View.TEXT_DIRECTION_RTL, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_LOCALE);
- assertEquals(View.TEXT_DIRECTION_LOCALE, tv.getResolvedTextDirection());
- }
-
- @UiThreadTest
- public void testGetResolvedTextDirectionRtl() {
- TextView tv = new TextView(mActivity);
- tv.setText("\u05DD\u05DE"); // hebrew
-
- assertEquals(View.TEXT_DIRECTION_FIRST_STRONG, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_FIRST_STRONG);
- assertEquals(View.TEXT_DIRECTION_FIRST_STRONG, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_ANY_RTL);
- assertEquals(View.TEXT_DIRECTION_ANY_RTL, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_INHERIT);
- assertEquals(View.TEXT_DIRECTION_FIRST_STRONG, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_LTR);
- assertEquals(View.TEXT_DIRECTION_LTR, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_RTL);
- assertEquals(View.TEXT_DIRECTION_RTL, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_LOCALE);
- assertEquals(View.TEXT_DIRECTION_LOCALE, tv.getResolvedTextDirection());
- }
-
- @UiThreadTest
- public void testGetResolvedTextDirectionRtlWithInheritance() {
- LinearLayout ll = new LinearLayout(mActivity);
- ll.setTextDirection(View.TEXT_DIRECTION_FIRST_STRONG);
-
- TextView tv = new TextView(mActivity);
- tv.setText("\u05DD\u05DE"); // hebrew
- ll.addView(tv);
-
- tv.setTextDirection(View.TEXT_DIRECTION_FIRST_STRONG);
- assertEquals(View.TEXT_DIRECTION_FIRST_STRONG, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_ANY_RTL);
- assertEquals(View.TEXT_DIRECTION_ANY_RTL, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_INHERIT);
- assertEquals(View.TEXT_DIRECTION_FIRST_STRONG, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_LTR);
- assertEquals(View.TEXT_DIRECTION_LTR, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_RTL);
- assertEquals(View.TEXT_DIRECTION_RTL, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_LOCALE);
- assertEquals(View.TEXT_DIRECTION_LOCALE, tv.getResolvedTextDirection());
-
- // Force to RTL text direction on the layout
- ll.setTextDirection(View.TEXT_DIRECTION_RTL);
-
- tv.setTextDirection(View.TEXT_DIRECTION_FIRST_STRONG);
- assertEquals(View.TEXT_DIRECTION_FIRST_STRONG, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_ANY_RTL);
- assertEquals(View.TEXT_DIRECTION_ANY_RTL, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_INHERIT);
- assertEquals(View.TEXT_DIRECTION_RTL, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_LTR);
- assertEquals(View.TEXT_DIRECTION_LTR, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_RTL);
- assertEquals(View.TEXT_DIRECTION_RTL, tv.getResolvedTextDirection());
-
- tv.setTextDirection(View.TEXT_DIRECTION_LOCALE);
- assertEquals(View.TEXT_DIRECTION_LOCALE, tv.getResolvedTextDirection());
- }
-
- @UiThreadTest
- public void testResetTextDirection() {
- LinearLayout ll = (LinearLayout) mActivity.findViewById(R.id.layout_textviewtest);
- TextView tv = (TextView) mActivity.findViewById(R.id.textview_rtl);
-
- ll.setTextDirection(View.TEXT_DIRECTION_RTL);
- tv.setTextDirection(View.TEXT_DIRECTION_INHERIT);
- assertEquals(View.TEXT_DIRECTION_RTL, tv.getResolvedTextDirection());
-
- ll.removeView(tv);
- assertEquals(View.TEXT_DIRECTION_FIRST_STRONG, tv.getResolvedTextDirection());
- }
-
- @UiThreadTest
- public void testTextAlignmentDefault() {
- TextView tv = new TextView(getActivity());
- assertEquals(View.TEXT_ALIGNMENT_GRAVITY, tv.getTextAlignment());
- // resolved default text alignment is GRAVITY
- assertEquals(View.TEXT_ALIGNMENT_GRAVITY, tv.getResolvedTextAlignment());
- }
-
- @UiThreadTest
- public void testSetGetTextAlignment() {
- TextView tv = new TextView(getActivity());
-
- tv.setTextAlignment(View.TEXT_ALIGNMENT_GRAVITY);
- assertEquals(View.TEXT_ALIGNMENT_GRAVITY, tv.getTextAlignment());
-
- tv.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
- assertEquals(View.TEXT_ALIGNMENT_CENTER, tv.getTextAlignment());
-
- tv.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_START);
- assertEquals(View.TEXT_ALIGNMENT_TEXT_START, tv.getTextAlignment());
-
- tv.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_END);
- assertEquals(View.TEXT_ALIGNMENT_TEXT_END, tv.getTextAlignment());
-
- tv.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
- assertEquals(View.TEXT_ALIGNMENT_VIEW_START, tv.getTextAlignment());
-
- tv.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
- assertEquals(View.TEXT_ALIGNMENT_VIEW_END, tv.getTextAlignment());
- }
-
- @UiThreadTest
- public void testGetResolvedTextAlignment() {
- TextView tv = new TextView(getActivity());
-
- assertEquals(View.TEXT_ALIGNMENT_GRAVITY, tv.getResolvedTextAlignment());
-
- tv.setTextAlignment(View.TEXT_ALIGNMENT_GRAVITY);
- assertEquals(View.TEXT_ALIGNMENT_GRAVITY, tv.getResolvedTextAlignment());
-
- tv.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
- assertEquals(View.TEXT_ALIGNMENT_CENTER, tv.getResolvedTextAlignment());
-
- tv.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_START);
- assertEquals(View.TEXT_ALIGNMENT_TEXT_START, tv.getResolvedTextAlignment());
-
- tv.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_END);
- assertEquals(View.TEXT_ALIGNMENT_TEXT_END, tv.getResolvedTextAlignment());
-
- tv.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
- assertEquals(View.TEXT_ALIGNMENT_VIEW_START, tv.getResolvedTextAlignment());
-
- tv.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
- assertEquals(View.TEXT_ALIGNMENT_VIEW_END, tv.getResolvedTextAlignment());
- }
-
- @UiThreadTest
- public void testGetResolvedTextAlignmentWithInheritance() {
- LinearLayout ll = new LinearLayout(getActivity());
- ll.setTextAlignment(View.TEXT_ALIGNMENT_GRAVITY);
-
- TextView tv = new TextView(getActivity());
- ll.addView(tv);
-
- // check defaults
- assertEquals(View.TEXT_ALIGNMENT_GRAVITY, tv.getTextAlignment());
- assertEquals(View.TEXT_ALIGNMENT_GRAVITY, tv.getResolvedTextAlignment());
-
- // set inherit and check that child is following parent
- tv.setTextAlignment(View.TEXT_ALIGNMENT_INHERIT);
- assertEquals(View.TEXT_ALIGNMENT_INHERIT, tv.getTextAlignment());
-
- ll.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
- assertEquals(View.TEXT_ALIGNMENT_CENTER, tv.getResolvedTextAlignment());
-
- ll.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_START);
- assertEquals(View.TEXT_ALIGNMENT_TEXT_START, tv.getResolvedTextAlignment());
-
- ll.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_END);
- assertEquals(View.TEXT_ALIGNMENT_TEXT_END, tv.getResolvedTextAlignment());
-
- ll.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
- assertEquals(View.TEXT_ALIGNMENT_VIEW_START, tv.getResolvedTextAlignment());
-
- ll.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
- assertEquals(View.TEXT_ALIGNMENT_VIEW_END, tv.getResolvedTextAlignment());
-
- // now get rid of the inheritance but still change the parent
- tv.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-
- ll.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
- assertEquals(View.TEXT_ALIGNMENT_CENTER, tv.getResolvedTextAlignment());
-
- ll.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_START);
- assertEquals(View.TEXT_ALIGNMENT_CENTER, tv.getResolvedTextAlignment());
-
- ll.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_END);
- assertEquals(View.TEXT_ALIGNMENT_CENTER, tv.getResolvedTextAlignment());
-
- ll.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
- assertEquals(View.TEXT_ALIGNMENT_CENTER, tv.getResolvedTextAlignment());
-
- ll.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
- assertEquals(View.TEXT_ALIGNMENT_CENTER, tv.getResolvedTextAlignment());
- }
-
- @UiThreadTest
- public void testResetTextAlignment() {
- TextViewStubActivity activity = getActivity();
-
- LinearLayout ll = (LinearLayout) activity.findViewById(R.id.layout_textviewtest);
- TextView tv = (TextView) activity.findViewById(R.id.textview_rtl);
-
- ll.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
- tv.setTextAlignment(View.TEXT_ALIGNMENT_INHERIT);
- assertEquals(View.TEXT_ALIGNMENT_CENTER, tv.getResolvedTextAlignment());
-
- ll.removeView(tv);
- // default text alignment is GRAVITY
- assertEquals(View.TEXT_ALIGNMENT_GRAVITY, tv.getResolvedTextAlignment());
- }
-
private static class MockOnEditorActionListener implements OnEditorActionListener {
private boolean isOnEditorActionCalled;