commit 77ba6b9cad542a78910b6d7c638a1254b31d79ab
author Sunny Goyal <sunnygoyal@google.com> Fri Jul 15 18:05:15 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 15 18:05:15 2016 +0000
tree 6dc3a73ceb971b8241e895e93ee7b964c153f099
parent 879f3bcef5fd05683f2aa19e3b68073f0dec18ec
parent 6f02f2ffb4b3cec91891bed9a0c179d2c913d27e

Merge "Fixing adjascent pages not visible when starting animation" into ub-launcher3-calgary

src/com/android/launcher3/allapps/AllAppsContainerView.java

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 561cc41..f0469e3 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -329,7 +329,11 @@
                         searchInputAnimator.end();
                     }
 
-                    searchInputAnimator.setFloatValues(searchHint.getLeft(), 0);
+                    if (Utilities.isRtl(getContext().getResources())) {
+                        searchInputAnimator.setFloatValues(-searchHint.getLeft(), 0);
+                    } else {
+                        searchInputAnimator.setFloatValues(searchHint.getLeft(), 0);
+                    }
                     searchInputAnimator.start();
                 } else {
                     searchHint.setVisibility(View.VISIBLE);

src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java

diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java b/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java
index 4403b5a..f18c799 100644
--- a/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java
+++ b/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java
@@ -167,7 +167,7 @@
         int lineWidth = (int) (availableWidth / mNumPagesFloat);
         int lineLeft = (int) (progress * (availableWidth - lineWidth));
         int lineRight = lineLeft + lineWidth;
-        canvas.drawRect(lineLeft, canvas.getHeight() + mLineHeight, lineRight, canvas.getHeight(),
+        canvas.drawRect(lineLeft, canvas.getHeight() - mLineHeight, lineRight, canvas.getHeight(),
                 mLinePaint);
     }