From 410a047e614dd1c28b6698a0b62f24fe527660ea Mon Sep 17 00:00:00 2001 From: Michelle Sintov Date: Fri, 2 Oct 2015 18:27:41 -0700 Subject: [PATCH 1/2] Pause media overlay in WebViewActivity onPause, and resume in WebViewActivity onResume --- .../sdk/android/launcher/WebViewActivity.java | 13 +++++++++++++ .../sdk/android/launcher/model/ReadiumJSApi.java | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/SDKLauncher-Android/src/org/readium/sdk/android/launcher/WebViewActivity.java b/SDKLauncher-Android/src/org/readium/sdk/android/launcher/WebViewActivity.java index a4a7b250..2db6adb7 100644 --- a/SDKLauncher-Android/src/org/readium/sdk/android/launcher/WebViewActivity.java +++ b/SDKLauncher-Android/src/org/readium/sdk/android/launcher/WebViewActivity.java @@ -202,6 +202,7 @@ public byte[] handle(byte[] data, String mime, String uriPath, private boolean mIsMoAvailable; private boolean mIsMoPlaying; + private boolean mShouldResumeMO; private int mEpubRsoInjectCounter = 0; @Override @@ -287,6 +288,12 @@ protected void onDestroy() { @Override protected void onPause() { super.onPause(); + + if (mIsMoPlaying) { + mShouldResumeMO = true; + mReadiumJSApi.pauseMediaOverlay(); + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { mWebview.onPause(); } @@ -295,6 +302,12 @@ protected void onPause() { @Override protected void onResume() { super.onResume(); + + if (mShouldResumeMO) { + mShouldResumeMO = false; + mReadiumJSApi.playMediaOverlay(); + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { mWebview.onResume(); } diff --git a/SDKLauncher-Android/src/org/readium/sdk/android/launcher/model/ReadiumJSApi.java b/SDKLauncher-Android/src/org/readium/sdk/android/launcher/model/ReadiumJSApi.java index db8993d7..a991c42e 100644 --- a/SDKLauncher-Android/src/org/readium/sdk/android/launcher/model/ReadiumJSApi.java +++ b/SDKLauncher-Android/src/org/readium/sdk/android/launcher/model/ReadiumJSApi.java @@ -100,6 +100,14 @@ public void toggleMediaOverlay(){ loadJSOnReady("ReadiumSDK.reader.toggleMediaOverlay();"); } + public void pauseMediaOverlay(){ + loadJSOnReady("ReadiumSDK.reader.pauseMediaOverlay();"); + } + + public void playMediaOverlay(){ + loadJSOnReady("ReadiumSDK.reader.playMediaOverlay();"); + } + private void loadJSOnReady(String jScript) { From f14ec7163bc95b5f29f34bef988fde7a12e84be0 Mon Sep 17 00:00:00 2001 From: Michelle Sintov Date: Fri, 2 Oct 2015 21:05:04 -0700 Subject: [PATCH 2/2] White space changes only --- .../sdk/android/launcher/WebViewActivity.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SDKLauncher-Android/src/org/readium/sdk/android/launcher/WebViewActivity.java b/SDKLauncher-Android/src/org/readium/sdk/android/launcher/WebViewActivity.java index 2db6adb7..efe468f5 100644 --- a/SDKLauncher-Android/src/org/readium/sdk/android/launcher/WebViewActivity.java +++ b/SDKLauncher-Android/src/org/readium/sdk/android/launcher/WebViewActivity.java @@ -292,7 +292,7 @@ protected void onPause() { if (mIsMoPlaying) { mShouldResumeMO = true; mReadiumJSApi.pauseMediaOverlay(); - } + } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { mWebview.onPause(); @@ -302,11 +302,11 @@ protected void onPause() { @Override protected void onResume() { super.onResume(); - - if (mShouldResumeMO) { - mShouldResumeMO = false; - mReadiumJSApi.playMediaOverlay(); - } + + if (mShouldResumeMO) { + mShouldResumeMO = false; + mReadiumJSApi.playMediaOverlay(); + } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { mWebview.onResume();