diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-03-17 19:03:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-03-17 19:03:57 -0700 |
| commit | c3e1e90433d7b6118037a82aec77e2ce479275f4 (patch) | |
| tree | 6a57773f43363aa834fcaf0ad152c49d7a99e43f /src | |
| parent | 97b5b5bdf26970e8873ada05de73555a9872c933 (diff) | |
| parent | 1349c98a9836026f4b1af6a857058676f2ad0f02 (diff) | |
| download | android_packages_apps_Gallery2-c3e1e90433d7b6118037a82aec77e2ce479275f4.tar.gz android_packages_apps_Gallery2-c3e1e90433d7b6118037a82aec77e2ce479275f4.tar.bz2 android_packages_apps_Gallery2-c3e1e90433d7b6118037a82aec77e2ce479275f4.zip | |
Merge "Gallery2: Redesign grid spacing of landscape mode" into android_ui.lnx.1.2-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index 5fc16aa50..6a355577f 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -187,27 +187,16 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster int paddingRight; int paddingTop; - if (right - left > bottom - top) { - if (mViewType) { - paddingTop = mConfig.paddingLeft; - } else { - paddingTop = mConfigList.paddingLeft; - } - paddingBottom = mConfig.paddingBottomLand; - paddingRight = mConfig.paddingRightLand; - paddingLeft = mConfig.paddingLeftLand; - } - else { - if (mViewType) { - paddingTop = mConfig.paddingLeft; - paddingLeft = mConfig.paddingLeft; - } else { - paddingTop = mConfigList.paddingLeft; - paddingLeft = mConfigList.paddingLeft; - } - paddingBottom = mConfig.paddingBottom; - paddingRight = mConfig.paddingRight; + if (mViewType) { + paddingTop = mConfig.paddingLeft; + paddingLeft = mConfig.paddingLeft; + } else { + paddingTop = mConfigList.paddingLeft; + paddingLeft = mConfigList.paddingLeft; } + paddingBottom = mConfig.paddingBottom; + paddingRight = mConfig.paddingRight; + int slotViewTop = mActivity.getGalleryActionBar().getHeight() + paddingTop; int slotViewBottom = bottom - top - paddingBottom; |