diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-08-14 13:32:46 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-14 13:32:46 -0700 |
commit | 9ef602b77ad0cc7aca49a05f39f193277e0e8ae7 (patch) | |
tree | 0ea307f8c627190defe3627dc067569da47dfb2c | |
parent | a7c64453563b15d19b083ba546dce9f4aae42406 (diff) | |
parent | f17dbdf94fb5534266336f99bdd8014ace672ea7 (diff) | |
download | android_packages_apps_Snap-9ef602b77ad0cc7aca49a05f39f193277e0e8ae7.tar.gz android_packages_apps_Snap-9ef602b77ad0cc7aca49a05f39f193277e0e8ae7.tar.bz2 android_packages_apps_Snap-9ef602b77ad0cc7aca49a05f39f193277e0e8ae7.zip |
Merge "Gallery reskin: album list spacing, action bar theme" into gb-ub-photos-arches
-rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 11 | ||||
-rw-r--r-- | src/com/android/gallery3d/app/Config.java | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index 1df073466..1c5e1f908 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -78,6 +78,7 @@ public class AlbumSetPage extends ActivityState implements private boolean mIsActive = false; private SlotView mSlotView; private AlbumSetSlotRenderer mAlbumSetView; + private Config.AlbumSetPage mConfig; private MediaSet mMediaSet; private String mTitle; @@ -124,8 +125,8 @@ public class AlbumSetPage extends ActivityState implements boolean changed, int left, int top, int right, int bottom) { mEyePosition.resetPosition(); - int slotViewTop = mActionBar.getHeight(); - int slotViewBottom = bottom - top; + int slotViewTop = mActionBar.getHeight() + mConfig.paddingTop; + int slotViewBottom = bottom - top - mConfig.paddingBottom; int slotViewRight = right - left; if (mShowDetails) { @@ -368,10 +369,10 @@ public class AlbumSetPage extends ActivityState implements mSelectionManager = new SelectionManager(mActivity, true); mSelectionManager.setSelectionListener(this); - Config.AlbumSetPage config = Config.AlbumSetPage.get((Context) mActivity); - mSlotView = new SlotView(mActivity, config.slotViewSpec); + mConfig = Config.AlbumSetPage.get((Context) mActivity); + mSlotView = new SlotView(mActivity, mConfig.slotViewSpec); mAlbumSetView = new AlbumSetSlotRenderer( - mActivity, mSelectionManager, mSlotView, config.labelSpec); + mActivity, mSelectionManager, mSlotView, mConfig.labelSpec); mSlotView.setSlotRenderer(mAlbumSetView); mSlotView.setListener(new SlotView.SimpleListener() { @Override diff --git a/src/com/android/gallery3d/app/Config.java b/src/com/android/gallery3d/app/Config.java index bd4aed1d5..6fb24ec81 100644 --- a/src/com/android/gallery3d/app/Config.java +++ b/src/com/android/gallery3d/app/Config.java @@ -29,6 +29,8 @@ final class Config { public SlotView.Spec slotViewSpec; public AlbumSetSlotRenderer.LabelSpec labelSpec; + public int paddingTop; + public int paddingBottom; public static synchronized AlbumSetPage get(Context context) { if (sInstance == null) { @@ -45,6 +47,9 @@ final class Config { slotViewSpec.rowsPort = r.getInteger(R.integer.albumset_rows_port); slotViewSpec.slotGap = r.getDimensionPixelSize(R.dimen.albumset_slot_gap); + paddingTop = r.getDimensionPixelSize(R.dimen.albumset_padding_top); + paddingBottom = r.getDimensionPixelSize(R.dimen.albumset_padding_bottom); + labelSpec = new AlbumSetSlotRenderer.LabelSpec(); labelSpec.labelBackgroundHeight = r.getDimensionPixelSize( R.dimen.albumset_label_background_height); |