commit cfb3fb16db3062b6d65fc56fb5b368da0bd3a81b
author Svetoslav <svetoslavganov@google.com> Wed Sep 10 20:14:32 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 10 20:14:32 2014 +0000
tree 645a9cd93aef45f16c6d07c25973c29cf6a6193a
parent f5f31cfcf6ec48f7340357b81253924a7887c22e
parent 0421754a21ff93827ea6e02f21a09db8ce247de8

am d327046d: Merge "Fix page spacing in preview list." into lmp-dev

* commit 'd327046d05f6823e5ad3ee2ee81bf3531f23bbdc':
  Fix page spacing in preview list.

packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java

diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
index ce0b9b6..b6c36c7 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
@@ -442,7 +442,8 @@
                 * mPreviewPageMargin);
 
         final int verticalPadding;
-        if (mPageContentHeight + mFooterHeight + mPreviewListPadding > availableHeight) {
+        if (mPageContentHeight + mFooterHeight + mPreviewListPadding
+                + 2 * mPreviewPageMargin > availableHeight) {
             verticalPadding = Math.max(0,
                     (availableHeight - mPageContentHeight - mFooterHeight) / 2
                             - mPreviewPageMargin);