From 9293267cb000bee52768dc052183827fe0f423ec Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 8 Sep 2015 13:07:35 -0400
Subject: [PATCH] fix alpha picker layout quirks

---
 dashboard-ui/css/mediaplayer-video.css |  2 +-
 dashboard-ui/scripts/backdrops.js      | 19 ++++++++-----------
 dashboard-ui/scripts/librarybrowser.js | 26 ++++++--------------------
 3 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css
index 5ed23509bc..57bdaef4fb 100644
--- a/dashboard-ui/css/mediaplayer-video.css
+++ b/dashboard-ui/css/mediaplayer-video.css
@@ -17,7 +17,7 @@
     left: 0;
     right: 0;
     bottom: 0;
-    background-color: #222;
+    background-color: #000;
     color: #fff;
 }
 
diff --git a/dashboard-ui/scripts/backdrops.js b/dashboard-ui/scripts/backdrops.js
index d1aa26654f..b8da55fb19 100644
--- a/dashboard-ui/scripts/backdrops.js
+++ b/dashboard-ui/scripts/backdrops.js
@@ -208,24 +208,21 @@
 
         var page = this;
 
-        if (!page.classList.contains('staticBackdropPage')) {
+        if (page.classList.contains('backdropPage')) {
 
-            if (page.classList.contains('backdropPage')) {
+            if (enabled()) {
+                var type = page.getAttribute('data-backdroptype');
 
-                if (enabled()) {
-                    var type = page.getAttribute('data-backdroptype');
+                var parentId = page.classList.contains('globalBackdropPage') ? '' : LibraryMenu.getTopParentId();
 
-                    var parentId = page.classList.contains('globalBackdropPage') ? '' : LibraryMenu.getTopParentId();
+                showBackdrop(type, parentId);
 
-                    showBackdrop(type, parentId);
-
-                } else {
-                    page.classList.remove('backdropPage');
-                    clearBackdrop();
-                }
             } else {
+                page.classList.remove('backdropPage');
                 clearBackdrop();
             }
+        } else {
+            clearBackdrop();
         }
 
     });
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index f7cc1f5c78..10df909bb6 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -135,10 +135,12 @@
             }
 
             if (typeof ($.browser.androidVersion) == 'number' && !isNaN($.browser.androidVersion)) {
-                return $.browser.androidVersion >= 5;
+                if ($.browser.androidVersion < 5) {
+                    return false;
+                }
             }
 
-            return true;
+            return false;
         },
 
         configureSwipeTabs: function (ownerpage, tabs, pages) {
@@ -230,9 +232,8 @@
 
             if (LibraryBrowser.enableFullPaperTabs()) {
 
-                tabs.noSlide = true;
-
                 if ($.browser.safari) {
+                    tabs.noSlide = true;
                     tabs.noBar = true;
                 } else {
                     LibraryBrowser.configureSwipeTabs(ownerpage, tabs, pages);
@@ -262,11 +263,10 @@
                 // When transition animations are used, add a content loading delay to allow the animations to finish
                 // Otherwise with both operations happening at the same time, it can cause the animation to not run at full speed.
                 var pgs = this;
-                var delay = LibraryBrowser.animatePaperTabs() ? 500 : 0;
+                var delay = LibraryBrowser.animatePaperTabs() || !tabs.noSlide ? 500 : 0;
 
                 setTimeout(function () {
                     $(pgs).trigger('tabchange');
-                    LibraryBrowser.fixAlphabetPicker(pages);
                 }, delay);
             });
 
@@ -277,20 +277,6 @@
             }
         },
 
-        fixAlphabetPicker: function (parent) {
-
-            if (!$.browser.android || !AppInfo.isNativeApp) {
-                return;
-            }
-
-            var pickers = parent.querySelectorAll('.alphabetPicker');
-            for (var i = 0, length = pickers.length; i < length; i++) {
-                var picker = pickers[i];
-                picker.classList.add('hide');
-                picker.classList.remove('hide');
-            }
-        },
-
         onTabbedpagebeforeshow: function () {
 
             var page = this;