summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2012-09-25 13:47:36 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-25 13:47:37 -0700
commite19bbca93eb93d4daaf31ac3e7bd8e4c32838af4 (patch)
tree9635d910e4690140fcda33467223e5f7a3ca9d4e
parentaee3a0ef78793bb8d3fd48e2c5faa27d895cf9a9 (diff)
parent369dd0c3e62f7ee8204f13b2d2eb390a7f07b46f (diff)
downloadandroid_packages_apps_Trebuchet-e19bbca93eb93d4daaf31ac3e7bd8e4c32838af4.tar.gz
android_packages_apps_Trebuchet-e19bbca93eb93d4daaf31ac3e7bd8e4c32838af4.tar.bz2
android_packages_apps_Trebuchet-e19bbca93eb93d4daaf31ac3e7bd8e4c32838af4.zip
Merge "7225161 Launcher needs to add android:supportsRtl="true" in his AndroidManifest" into jb-mr1-dev
-rw-r--r--AndroidManifest.xml3
-rw-r--r--res/layout/apps_customize_pane.xml3
2 files changed, 4 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 05838a60a..3c3897e5c 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 efd29a673..41ba9e21e 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