summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2012-12-18 16:25:49 -0800
committerFabrice Di Meglio <fdimeglio@google.com>2013-01-23 18:23:06 -0800
commitcc11f742586b57c576026b7756a46209fe793ea1 (patch)
tree9b71fc15f975c68bfe7e35d5395669dee4df8b28 /src
parentffc9f488a31b99248c27977c53d3b5f731f590e7 (diff)
downloadandroid_packages_apps_Trebuchet-cc11f742586b57c576026b7756a46209fe793ea1.tar.gz
android_packages_apps_Trebuchet-cc11f742586b57c576026b7756a46209fe793ea1.tar.bz2
android_packages_apps_Trebuchet-cc11f742586b57c576026b7756a46209fe793ea1.zip
Add first RTL support to Launcher
See bug #8064062 Launcher needs to be RTL aware Change-Id: I24b1f1977fb65246afd2005440567b5850939621
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/AppWidgetResizeFrame.java4
-rw-r--r--src/com/android/launcher2/AppsCustomizePagedView.java4
-rw-r--r--src/com/android/launcher2/InfoDropTarget.java4
3 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/launcher2/AppWidgetResizeFrame.java b/src/com/android/launcher2/AppWidgetResizeFrame.java
index 13ee6f913..0fd39aee2 100644
--- a/src/com/android/launcher2/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher2/AppWidgetResizeFrame.java
@@ -96,13 +96,13 @@ public class AppWidgetResizeFrame extends FrameLayout {
mLeftHandle = new ImageView(context);
mLeftHandle.setImageResource(R.drawable.widget_resize_handle_left);
lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT,
- Gravity.LEFT | Gravity.CENTER_VERTICAL);
+ Gravity.START | Gravity.CENTER_VERTICAL);
addView(mLeftHandle, lp);
mRightHandle = new ImageView(context);
mRightHandle.setImageResource(R.drawable.widget_resize_handle_right);
lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT,
- Gravity.RIGHT | Gravity.CENTER_VERTICAL);
+ Gravity.END | Gravity.CENTER_VERTICAL);
addView(mRightHandle, lp);
mTopHandle = new ImageView(context);
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 4bfeb60b8..bd7839637 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -1451,11 +1451,11 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
int ix = i % mWidgetCountX;
int iy = i / mWidgetCountX;
GridLayout.LayoutParams lp = new GridLayout.LayoutParams(
- GridLayout.spec(iy, GridLayout.LEFT),
+ GridLayout.spec(iy, GridLayout.START),
GridLayout.spec(ix, GridLayout.TOP));
lp.width = cellWidth;
lp.height = cellHeight;
- lp.setGravity(Gravity.TOP | Gravity.LEFT);
+ lp.setGravity(Gravity.TOP | Gravity.START);
if (ix > 0) lp.leftMargin = mWidgetWidthGap;
if (iy > 0) lp.topMargin = mWidgetHeightGap;
layout.addView(widget, lp);
diff --git a/src/com/android/launcher2/InfoDropTarget.java b/src/com/android/launcher2/InfoDropTarget.java
index d6bf5f2cc..850cc1fe8 100644
--- a/src/com/android/launcher2/InfoDropTarget.java
+++ b/src/com/android/launcher2/InfoDropTarget.java
@@ -51,7 +51,9 @@ public class InfoDropTarget extends ButtonDropTarget {
Resources r = getResources();
mHoverColor = r.getColor(R.color.info_target_hover_tint);
mDrawable = (TransitionDrawable) getCurrentDrawable();
- mDrawable.setCrossFadeEnabled(true);
+ if (null != mDrawable) {
+ mDrawable.setCrossFadeEnabled(true);
+ }
// Remove the text in the Phone UI in landscape
int orientation = getResources().getConfiguration().orientation;