diff options
| author | Tianfu Yu <tianfu@codeaurora.org> | 2015-12-11 16:28:23 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-12-15 02:04:12 -0800 |
| commit | 417e92cdb7d5562c10c72a1d219bd62e0fbcbcf4 (patch) | |
| tree | e866b1db2c921844d7840d9eebd0cbb15ea2ddee /src | |
| parent | 12323ee160add778729013cdf0e262141d7fd1f4 (diff) | |
| download | android_packages_apps_Gallery2-417e92cdb7d5562c10c72a1d219bd62e0fbcbcf4.tar.gz android_packages_apps_Gallery2-417e92cdb7d5562c10c72a1d219bd62e0fbcbcf4.tar.bz2 android_packages_apps_Gallery2-417e92cdb7d5562c10c72a1d219bd62e0fbcbcf4.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/GalleryActivity.java | 4 | ||||
| -rwxr-xr-x | src/com/android/gallery3d/app/PhotoDataAdapter.java | 3 |
2 files changed, 4 insertions, 3 deletions
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; |