Merge pull request #43 from readium/feature/packageRenditionMetadata

danielweck · danielweck · commit 55281d71687e · 2014-12-12T09:12:46.000Z
spineItem.isFixedLayout now takes into account package-level metadata
diff --git a/SDKLauncher-Android/src/org/readium/sdk/android/launcher/WebViewActivity.java b/SDKLauncher-Android/src/org/readium/sdk/android/launcher/WebViewActivity.java
@@ -507,7 +507,7 @@ public void run() {
 									page.getSpineItemPageIndex() + 1,
 									page.getSpineItemPageCount()));
 							SpineItem spineItem = mPackage.getSpineItem(page.getIdref());
-							boolean isFixedLayout = spineItem.isFixedLayout();
+							boolean isFixedLayout = spineItem.isFixedLayout(mPackage);
 				            mWebview.getSettings().setBuiltInZoomControls(isFixedLayout);
 				            mWebview.getSettings().setDisplayZoomControls(false);
 						}
diff --git a/readium-sdk b/readium-sdk
@@ -1 +1 @@
-Subproject commit aacffe3c27dd39cb9f603fd5490938379148baf8
+Subproject commit 2c5a2ce748c746949ca09f6cd93a1c2203dfc74d

Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ public void run() {`
`507`	`507`	`page.getSpineItemPageIndex() + 1,`
`508`	`508`	`page.getSpineItemPageCount()));`
`509`	`509`	`SpineItem spineItem = mPackage.getSpineItem(page.getIdref());`
`510`		`- boolean isFixedLayout = spineItem.isFixedLayout();`
	`510`	`+ boolean isFixedLayout = spineItem.isFixedLayout(mPackage);`
`511`	`511`	`mWebview.getSettings().setBuiltInZoomControls(isFixedLayout);`
`512`	`512`	`mWebview.getSettings().setDisplayZoomControls(false);`
`513`	`513`	`}`