am ab37bce3: Merge changes If379cc4b,I1c6ccb01 into jb-ub-now-indigo-rose

* commit 'ab37bce36a7bc54cfcd634df95ca08e7e6143230':
  Fixing up all apps button pressed state:
  Fixing widget resize handles in RTL

13 files changed, 2 insertions, 2 deletions

diff --git a/res/drawable-hdpi/ic_allapps.png b/res/drawable-hdpi/ic_allapps.png
index 073bb3059..f55aabfbf 100644
--- a/res/drawable-hdpi/ic_allapps.png
+++ b/res/drawable-hdpi/ic_allapps.png
diff --git a/res/drawable-hdpi/ic_allapps_off.png b/res/drawable-hdpi/ic_allapps_off.png
deleted file mode 100644
index bbc4d7d03..000000000
--- a/res/drawable-hdpi/ic_allapps_off.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_allapps_pressed.png b/res/drawable-hdpi/ic_allapps_pressed.png
index a43b9e15c..bbc4d7d03 100644
--- a/res/drawable-hdpi/ic_allapps_pressed.png
+++ b/res/drawable-hdpi/ic_allapps_pressed.png
diff --git a/res/drawable-mdpi/ic_allapps.png b/res/drawable-mdpi/ic_allapps.png
index 8c5efd792..d95f1bfc4 100644
--- a/res/drawable-mdpi/ic_allapps.png
+++ b/res/drawable-mdpi/ic_allapps.png
diff --git a/res/drawable-mdpi/ic_allapps_off.png b/res/drawable-mdpi/ic_allapps_off.png
deleted file mode 100644
index e24b9d73b..000000000
--- a/res/drawable-mdpi/ic_allapps_off.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_allapps_pressed.png b/res/drawable-mdpi/ic_allapps_pressed.png
index 18375ab4e..e24b9d73b 100644
--- a/res/drawable-mdpi/ic_allapps_pressed.png
+++ b/res/drawable-mdpi/ic_allapps_pressed.png
diff --git a/res/drawable-xhdpi/ic_allapps.png b/res/drawable-xhdpi/ic_allapps.png
index 21c4252fa..0e4316c90 100644
--- a/res/drawable-xhdpi/ic_allapps.png
+++ b/res/drawable-xhdpi/ic_allapps.png
diff --git a/res/drawable-xhdpi/ic_allapps_off.png b/res/drawable-xhdpi/ic_allapps_off.png
deleted file mode 100644
index 2b1333087..000000000
--- a/res/drawable-xhdpi/ic_allapps_off.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_allapps_pressed.png b/res/drawable-xhdpi/ic_allapps_pressed.png
index 3bbcbceb6..2b1333087 100644
--- a/res/drawable-xhdpi/ic_allapps_pressed.png
+++ b/res/drawable-xhdpi/ic_allapps_pressed.png
diff --git a/res/drawable-xxhdpi/ic_allapps.png b/res/drawable-xxhdpi/ic_allapps.png
index 021832a11..9d5d80cae 100644
--- a/res/drawable-xxhdpi/ic_allapps.png
+++ b/res/drawable-xxhdpi/ic_allapps.png
diff --git a/res/drawable-xxhdpi/ic_allapps_off.png b/res/drawable-xxhdpi/ic_allapps_off.png
deleted file mode 100644
index b6a34a820..000000000
--- a/res/drawable-xxhdpi/ic_allapps_off.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_allapps_pressed.png b/res/drawable-xxhdpi/ic_allapps_pressed.png
index 9c7b63637..b6a34a820 100644
--- a/res/drawable-xxhdpi/ic_allapps_pressed.png
+++ b/res/drawable-xxhdpi/ic_allapps_pressed.png
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index 02958d060..fcb04ea08 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -95,13 +95,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.START | Gravity.CENTER_VERTICAL);
+                Gravity.LEFT | 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.END | Gravity.CENTER_VERTICAL);
+                Gravity.RIGHT | Gravity.CENTER_VERTICAL);
         addView(mRightHandle, lp);
 
         mTopHandle = new ImageView(context);