diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-08-13 14:27:08 -0700 |
---|---|---|
committer | Bobby Georgescu <georgescu@google.com> | 2012-08-14 11:47:16 -0700 |
commit | f0c89374bfc008fb79ac3cb91cfd6d565d203041 (patch) | |
tree | 34849e786d0b1ca0d13ff8dfd105960752843c17 | |
parent | e24cc7208a6d3760a87dfd4b80a7a6683fe146eb (diff) | |
download | android_packages_apps_Gallery2-f0c89374bfc008fb79ac3cb91cfd6d565d203041.tar.gz android_packages_apps_Gallery2-f0c89374bfc008fb79ac3cb91cfd6d565d203041.tar.bz2 android_packages_apps_Gallery2-f0c89374bfc008fb79ac3cb91cfd6d565d203041.zip |
Gallery reskin: album list spacing, action bar theme
Change-Id: Ic556f22bd25c57ddd0b659a7f43a7a1afbdcb8df
-rw-r--r-- | res/values/dimensions.xml | 2 | ||||
-rw-r--r-- | res/values/styles.xml | 4 | ||||
-rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 11 | ||||
-rw-r--r-- | src/com/android/gallery3d/app/Config.java | 5 |
4 files changed, 14 insertions, 8 deletions
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 009a2e13e..906dbdb83 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -22,6 +22,8 @@ <!-- configuration for album set page --> <integer name="albumset_rows_land">1</integer> <integer name="albumset_rows_port">2</integer> + <dimen name="albumset_padding_top">15dp</dimen> + <dimen name="albumset_padding_bottom">15dp</dimen> <dimen name="albumset_slot_gap">12dp</dimen> <dimen name="albumset_label_background_height">45dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index 3239f681d..05bff4611 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -27,10 +27,8 @@ <item name="android:colorBackground">@null</item> <item name="android:colorBackgroundCacheHint">@null</item> </style> - <style name="Holo.ActionBar" parent="android:Widget.Holo.ActionBar"> + <style name="Holo.ActionBar" parent="android:Widget.Holo.ActionBar.Solid"> <item name="android:displayOptions">useLogo|showHome</item> - <item name="android:background">@drawable/actionbar_translucent</item> - <item name="android:backgroundStacked">@null</item> </style> <style name="MediaButton.Play" parent="@android:style/MediaButton.Play"> <item name="android:background">@null</item> 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); |