summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2017-12-15 21:58:07 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-12-15 21:58:07 +0000
commit29f61c21f4b747b82bd32aed79547d2430ebedf7 (patch)
treeeac875146a5a5883c66781e7023f858e30dc2a3a
parent4e54d6092bbcb2ac7ff895a7955acdd1e26e838c (diff)
parent63c4f3318c27c6203728d2c31215be9a92e0d501 (diff)
Merge "Fixed create app shortcut text and icon alignment in RTL Language"
-rw-r--r--core/java/android/app/LauncherActivity.java2
-rw-r--r--core/res/res/layout/activity_list_item_2.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/LauncherActivity.java b/core/java/android/app/LauncherActivity.java
index 9ec7f4134a30..88e235660c09 100644
--- a/core/java/android/app/LauncherActivity.java
+++ b/core/java/android/app/LauncherActivity.java
@@ -166,7 +166,7 @@ public abstract class LauncherActivity extends ListActivity {
if (item.icon == null) {
item.icon = mIconResizer.createIconThumbnail(item.resolveInfo.loadIcon(getPackageManager()));
}
- text.setCompoundDrawablesWithIntrinsicBounds(item.icon, null, null, null);
+ text.setCompoundDrawablesRelativeWithIntrinsicBounds(item.icon, null, null, null);
}
}
diff --git a/core/res/res/layout/activity_list_item_2.xml b/core/res/res/layout/activity_list_item_2.xml
index 608e9861dfbe..af1963c7c39a 100644
--- a/core/res/res/layout/activity_list_item_2.xml
+++ b/core/res/res/layout/activity_list_item_2.xml
@@ -21,5 +21,6 @@
android:textAppearance="?attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:drawablePadding="14dip"
+ android:textAlignment="viewStart"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd" />