Issue #1664 - Move nav bar out of scrollview

mozilla-mobile · Feb 23, 2019 · 25413f1 · 25413f1
1 parent ca2ceb7
commit 25413f1
Showing 1 changed file with 48 additions and 43 deletions.
diff --git a/app/src/main/res/layout/fragment_navigation_overlay.xml b/app/src/main/res/layout/fragment_navigation_overlay.xml
@@ -24,49 +24,6 @@
             android:paddingTop="27dp"
             android:paddingBottom="0dp">
 
-            <LinearLayout
-                android:id="@+id/topNavContainer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="57dp"
-                android:layout_marginEnd="57dp"
-                android:layout_marginBottom="27dp"
-                android:descendantFocusability="afterDescendants"
-                android:focusable="true"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <include layout="@layout/fragment_navigation_overlay_top_nav" />
-            </LinearLayout>
-
-            <!-- An explicit nextFocusUp seems necessary to make up work consistently.
-            Drawable tinted in code (XML needs API 23+).
-
-            android:importantForAutofill (XML needs API 26+) requires tools:ignore="UnusedAttribute" for lint check -->
-            <org.mozilla.tv.firefox.widget.InlineAutocompleteEditText
-                android:id="@+id/navUrlInput"
-                android:layout_width="498dp"
-                android:layout_height="@dimen/urlbar_height"
-                android:layout_marginStart="57dp"
-                android:layout_marginBottom="48dp"
-                android:background="@drawable/nav_urlbar_background"
-                android:cursorVisible="false"
-                android:drawableStart="@drawable/mozac_ic_search"
-                android:drawablePadding="10dp"
-                android:hint="@string/urlbar_hint"
-                android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
-                android:importantForAutofill="no"
-                tools:ignore="UnusedAttribute"
-                android:inputType="textUri"
-                android:lines="1"
-                android:nextFocusRight="@id/navUrlInput"
-                android:nextFocusUp="@id/topNavContainer"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
-                android:textColor="@color/photonGrey10"
-                android:textColorHint="@color/photonGrey10_a80p"
-                android:textIsSelectable="false" />
-
             <!-- Content description added in code. -->
             <org.mozilla.tv.firefox.pocket.PocketVideoMegaTile
                 android:id="@+id/pocketVideoMegaTileView"
@@ -91,4 +48,52 @@
 
         </LinearLayout>
     </android.support.v4.widget.NestedScrollView>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/topNavContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="57dp"
+            android:layout_marginEnd="57dp"
+            android:layout_marginBottom="27dp"
+            android:descendantFocusability="afterDescendants"
+            android:focusable="true"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <include layout="@layout/fragment_navigation_overlay_top_nav" />
+        </LinearLayout>
+
+        <!-- An explicit nextFocusUp seems necessary to make up work consistently.
+        Drawable tinted in code (XML needs API 23+).
+
+        android:importantForAutofill (XML needs API 26+) requires tools:ignore="UnusedAttribute" for lint check -->
+        <org.mozilla.tv.firefox.widget.InlineAutocompleteEditText
+            android:id="@+id/navUrlInput"
+            android:layout_width="498dp"
+            android:layout_height="@dimen/urlbar_height"
+            android:layout_marginStart="57dp"
+            android:layout_marginBottom="48dp"
+            android:background="@drawable/nav_urlbar_background"
+            android:cursorVisible="false"
+            android:drawableStart="@drawable/mozac_ic_search"
+            android:drawablePadding="10dp"
+            android:hint="@string/urlbar_hint"
+            android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
+            android:importantForAutofill="no"
+            tools:ignore="UnusedAttribute"
+            android:inputType="textUri"
+            android:lines="1"
+            android:nextFocusRight="@id/navUrlInput"
+            android:nextFocusUp="@id/topNavContainer"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
+            android:textColor="@color/photonGrey10"
+            android:textColorHint="@color/photonGrey10_a80p"
+            android:textIsSelectable="false" />
+    </LinearLayout>
 </org.mozilla.tv.firefox.navigationoverlay.BrowserNavigationOverlayScrollView>