From 417e92cdb7d5562c10c72a1d219bd62e0fbcbcf4 Mon Sep 17 00:00:00 2001
From: Tianfu Yu <tianfu@codeaurora.org>
Date: Fri, 11 Dec 2015 16:28:23 +0800
Subject: Gallery2:  Fix Gallery display normally in RTL

Fix Gallery app forced to close in RTL mode
Make the picture selected display normally

Change-Id: Id68bf72ce44eaaaa45fbbc0d9f7327fd1a0c52fa
---
 src/com/android/gallery3d/app/GalleryActivity.java  | 4 ++--
 src/com/android/gallery3d/app/PhotoDataAdapter.java | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java
index d7ee8fcf9..3cbde806b 100644
--- a/src/com/android/gallery3d/app/GalleryActivity.java
+++ b/src/com/android/gallery3d/app/GalleryActivity.java
@@ -161,7 +161,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
 
                         mNavigationAdapter.setClickPosition(position);
                         mDrawerListView.invalidateViews();
-                        mDrawerLayout.closeDrawer(Gravity.LEFT);
+                        mDrawerLayout.closeDrawer(Gravity.START);
                         getGLRoot().unlockRenderThread();
                     }
                 });
@@ -199,7 +199,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
             @Override
             public void onClick(View v) {
                 if (mToolbar.getNavigationContentDescription().equals("drawer")) {
-                    mDrawerLayout.openDrawer(Gravity.LEFT);
+                    mDrawerLayout.openDrawer(Gravity.START);
 
                 } else {
                     mToolbar.setNavigationContentDescription("drawer");
diff --git a/src/com/android/gallery3d/app/PhotoDataAdapter.java b/src/com/android/gallery3d/app/PhotoDataAdapter.java
index 3ab948772..aa28b5557 100755
--- a/src/com/android/gallery3d/app/PhotoDataAdapter.java
+++ b/src/com/android/gallery3d/app/PhotoDataAdapter.java
@@ -1168,8 +1168,9 @@ public class PhotoDataAdapter implements PhotoPage.Model {
                         // If RTL and it's not from widget, the index don't need to be amended
                         if (View.LAYOUT_DIRECTION_RTL == TextUtils
                                 .getLayoutDirectionFromLocale(Locale.getDefault())
+                                && info.contentStart < info.contentEnd
                                 && !mIsFromWidget) {
-                            index = info.indexHint;
+                            index = info.size - findIndexOfTarget(info) - 1;
                         } else {
                             index = findIndexOfTarget(info);
                             mIsFromWidget = false;
-- 
cgit v1.2.3