diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2013-01-24 21:50:23 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-24 21:50:23 +0000 |
commit | 892d023c548a5e49b67b4c81ff1e3e9d02004e6e (patch) | |
tree | 32f05aa0f8785914d6bdf7f346d0ed05f6ad3ec6 /src | |
parent | a0d39c9da94bfd21227e3fca1065ccaa782962af (diff) | |
parent | cc11f742586b57c576026b7756a46209fe793ea1 (diff) | |
download | android_packages_apps_Trebuchet-892d023c548a5e49b67b4c81ff1e3e9d02004e6e.tar.gz android_packages_apps_Trebuchet-892d023c548a5e49b67b4c81ff1e3e9d02004e6e.tar.bz2 android_packages_apps_Trebuchet-892d023c548a5e49b67b4c81ff1e3e9d02004e6e.zip |
Merge "Add first RTL support to Launcher"
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/AppWidgetResizeFrame.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher2/InfoDropTarget.java | 4 |
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 e36eee29a..1817c824f 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; |