Merge "7225161 Launcher needs to add android:supportsRtl="true" in his AndroidManifest" into jb-mr1-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 05838a6..3c3897e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -66,7 +66,8 @@
android:label="@string/application_name"
android:icon="@drawable/ic_launcher_home"
android:hardwareAccelerated="true"
- android:largeHeap="@bool/config_largeHeap">
+ android:largeHeap="@bool/config_largeHeap"
+ android:supportsRtl="true">
<activity
android:name="com.android.launcher2.Launcher"
android:launchMode="singleTask"
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index efd29a6..41ba9e2 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -22,7 +22,8 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:visibility="gone">
+ android:visibility="gone"
+ android:layoutDirection="ltr">
<!-- The layout_width of the tab bar gets overriden to align the content
with the text in the tabs in AppsCustomizeTabHost. -->
<FrameLayout