From 9f38a333888ef8370a72e0fd87cf5fc450d2b5f8 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 10 May 2016 01:00:50 -0400
Subject: [PATCH] update recording editor

---
 .../recordingeditor.template.html             | 31 ++++++++-----------
 dashboard-ui/scripts/mediaplayer-video.js     |  6 ++--
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/dashboard-ui/components/recordingeditor/recordingeditor.template.html b/dashboard-ui/components/recordingeditor/recordingeditor.template.html
index dcf5890aa7..8c14c400fd 100644
--- a/dashboard-ui/components/recordingeditor/recordingeditor.template.html
+++ b/dashboard-ui/components/recordingeditor/recordingeditor.template.html
@@ -30,26 +30,21 @@
     <p style="margin-top: 2em;" class="timerStatus">
     </p>
 </div>
-<br />
 <form class="liveTvTimerForm" style="margin: 0 auto;">
-    <h1>${HeaderRecordingOptions}</h1>
-
-    <emby-collapsible title="${HeaderAdvanced}">
-        <br />
-        <div>
-            <paper-input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}"></paper-input>
-        </div>
-        <br />
-        <div>
-            <paper-input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}"></paper-input>
-        </div>
-        <br />
-    </emby-collapsible>
-    <br />
     <br />
     <div>
-        <button type="submit" data-role="none" class="clearButton btnSave">
-            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-        </button>
+        <paper-input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}"></paper-input>
     </div>
+    <br />
+    <div>
+        <paper-input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}"></paper-input>
+    </div>
+    <br />
+    <br />
+    <button type="submit" data-role="none" class="clearButton btnSave">
+        <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
+    </button>
+    <br />
+    <br />
+    <br />
 </form>
\ No newline at end of file
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index d9635c64ea..5b266aa6e3 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -696,7 +696,9 @@
             html += '<div id="pause" class="status"></div>';
             html += '</div>';
 
-            html += '<div class="videoTopControls hiddenOnIdle">';
+            var hiddenOnIdleClass = AppInfo.isNativeApp && browserInfo.android ? 'hiddenOnIdle hide' : 'hiddenOnIdle';
+
+            html += '<div class="videoTopControls ' + hiddenOnIdleClass + '">';
             html += '<div class="videoTopControlsLogo"></div>';
             html += '<div class="videoAdvancedControls">';
 
@@ -713,7 +715,7 @@
             html += '</div>'; // videoTopControls
 
             // Create controls
-            html += '<div class="videoControls hiddenOnIdle">';
+            html += '<div class="videoControls ' + hiddenOnIdleClass + '">';
 
             html += '<div class="nowPlayingInfo hide">';
             html += '<div class="nowPlayingImage"></div>';