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 | |
| 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
| -rw-r--r-- | res/values/dimens.xml | 24 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 29 |
2 files changed, 21 insertions, 32 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 2b72812de..d636a9aac 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -132,11 +132,11 @@ <dimen name="albumset_icon_size">25dp</dimen> <!-- configuration for albumset page in Landscape--> - <dimen name="albumset_slot_gap_land">29dp</dimen> - <dimen name="albumset_padding_top_land">30dp</dimen> - <dimen name="albumset_padding_bottom_land">30dp</dimen> - <dimen name="albumset_padding_left_land">30dp</dimen> - <dimen name="albumset_padding_right_land">30dp</dimen> + <dimen name="albumset_slot_gap_land">4dp</dimen> + <dimen name="albumset_padding_top_land">4dp</dimen> + <dimen name="albumset_padding_bottom_land">4dp</dimen> + <dimen name="albumset_padding_left_land">4dp</dimen> + <dimen name="albumset_padding_right_land">4dp</dimen> <!-- configuration for album page --> <integer name="album_rows_land">2</integer> @@ -151,11 +151,11 @@ <dimen name="album_padding_right">3dp</dimen> <!-- configuration for album page in Landscape--> - <dimen name="album_slot_gap_land">7dp</dimen> - <dimen name="album_padding_top_land">16dp</dimen> - <dimen name="album_padding_bottom_land">7dp</dimen> - <dimen name="album_padding_left_land">16dp</dimen> - <dimen name="album_padding_right_land">16dp</dimen> + <dimen name="album_slot_gap_land">3dp</dimen> + <dimen name="album_padding_top_land">3dp</dimen> + <dimen name="album_padding_bottom_land">3dp</dimen> + <dimen name="album_padding_left_land">3dp</dimen> + <dimen name="album_padding_right_land">3dp</dimen> <!-- configuration for manage page --> <dimen name="cache_pin_size">24dp</dimen> @@ -202,8 +202,8 @@ <dimen name="dialog_text_size">14sp</dimen> <dimen name="timeline_port_slot_gap">3dp</dimen> - <dimen name="timeline_land_slot_gap">7dp</dimen> - <dimen name="timeline_land_margin">16dp</dimen> + <dimen name="timeline_land_slot_gap">3dp</dimen> + <dimen name="timeline_land_margin">3dp</dimen> <dimen name="timeline_port_margin">3dp</dimen> <dimen name="timeline_title_height">48dp</dimen> <dimen name="timeline_title_font_size">14sp</dimen> 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; |