Bug 1130630 - Move zoomed_view_stub from shared_ui_components to gecko_app. r=mcomella
authordominique vincent <domivinc@toitl.com>
Thu, 12 Feb 2015 22:12:48 +0100
changeset 229477 ec8bf5a601efcab27fb94c39dc29329981e1e214
parent 229476 306eab8d8ffebc9b1ab7b440850c18c1aecba75f
child 229478 9d7cc5a9570f382d9ab6408ccec3ed8b00044c12
push id11354
push userryanvm@gmail.com
push dateTue, 17 Feb 2015 21:26:36 +0000
treeherderfx-team@9d7cc5a9570f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcomella
bugs1130630
milestone38.0a1
Bug 1130630 - Move zoomed_view_stub from shared_ui_components to gecko_app. r=mcomella
mobile/android/base/resources/layout/gecko_app.xml
mobile/android/base/resources/layout/shared_ui_components.xml
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -24,16 +24,22 @@
         <RelativeLayout android:id="@+id/gecko_layout"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_below="@+id/new_tablet_tab_strip"
                         android:layout_above="@+id/find_in_page">
 
             <include layout="@layout/shared_ui_components"/>
 
+            <ViewStub android:id="@+id/zoomed_view_stub"
+                      android:inflatedId="@+id/zoomed_view"
+                      android:layout="@layout/zoomed_view"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content" />
+
             <FrameLayout android:id="@+id/home_pager_container"
                          android:layout_width="match_parent"
                          android:layout_height="match_parent"
                          android:visibility="gone">
 
                 <ViewStub android:id="@+id/home_pager_stub"
                           android:layout="@layout/home_pager"
                           android:layout_width="match_parent"
--- a/mobile/android/base/resources/layout/shared_ui_components.xml
+++ b/mobile/android/base/resources/layout/shared_ui_components.xml
@@ -21,22 +21,16 @@
 
     <org.mozilla.gecko.FormAssistPopup android:id="@+id/form_assist_popup"
                                        android:layout_width="match_parent"
                                        android:layout_height="match_parent"
                                        android:visibility="gone"/>
 
     <include layout="@layout/text_selection_handles"/>
 
-    <ViewStub android:id="@+id/zoomed_view_stub"
-               android:inflatedId="@+id/zoomed_view"
-               android:layout="@layout/zoomed_view"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content" />
-
     <FrameLayout android:id="@+id/camera_layout"
                  android:layout_height="wrap_content"
                  android:layout_width="wrap_content"
                  android:layout_alignParentRight="true"
                  android:layout_alignParentBottom="true">
     </FrameLayout>
 
 </merge>