Closes mozilla-mobile#1669 - Show WebRenderFragment through overlay, …

…tweak overlay padding.
liuche · Feb 23, 2019 · 09ae5fa · 09ae5fa
1 parent 13ae8df
commit 09ae5fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/app/src/main/java/org/mozilla/tv/firefox/ScreenController.kt b/app/src/main/java/org/mozilla/tv/firefox/ScreenController.kt
@@ -10,6 +10,7 @@ import android.arch.lifecycle.MutableLiveData
 import android.content.Context
 import android.support.v4.app.FragmentManager
 import android.text.TextUtils
+import kotlinx.android.synthetic.main.fragment_navigation_overlay.*
 import mozilla.components.browser.session.Session
 import org.mozilla.tv.firefox.ScreenControllerStateMachine.ActiveScreen
 import org.mozilla.tv.firefox.ScreenControllerStateMachine.Transition
@@ -138,13 +139,12 @@ class ScreenController {
             }
 
             transaction.show(overlayFragment)
-                // TODO note that hiding WebRenderFragment will not be possible under a split overlay
-                .hide(renderFragment)
             MenuInteractionMonitor.menuOpened()
+            overlayFragment.navUrlInput.requestFocus()
         } else {
             transaction.hide(overlayFragment)
-                .show(renderFragment)
             MenuInteractionMonitor.menuClosed()
+            renderFragment.view?.requestFocus()
         }
         transaction.commit()
     }

diff --git a/app/src/main/res/layout/fragment_navigation_overlay.xml b/app/src/main/res/layout/fragment_navigation_overlay.xml
@@ -18,14 +18,19 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/browser_overlay_background"
             android:descendantFocusability="afterDescendants"
             android:orientation="vertical">
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="412dp"/>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingTop="32dp"
+                android:background="@color/browser_overlay_background">
             <!-- Content description added in code. -->
             <org.mozilla.tv.firefox.pocket.PocketVideoMegaTile
                 android:id="@+id/pocketVideoMegaTileView"
@@ -44,16 +49,17 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="45dp"
-                android:background="@android:color/transparent"
                 android:clipChildren="false"
                 android:clipToPadding="false" />
+            </LinearLayout>
 
         </LinearLayout>
     </org.mozilla.tv.firefox.navigationoverlay.BrowserNavigationOverlayScrollView>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="27dp"
+        android:background="@color/browser_overlay_background"
         android:orientation="vertical">
 
         <LinearLayout