Bug 864510: Remove big Firefox logo. [r=mfinkle]
authorSriram Ramasubramanian <sriram@mozilla.com>
Mon, 25 Mar 2013 15:45:45 -0700
changeset 156204 9ab2cb00222facafdfa53dce2029dc25ad5f5e7a
parent 156203 f8d0784186b7bf7a09a5729bdf4f450bd5e791bd
child 156205 0f895e8c3d7f123878fa31c8745eb2db5be22bea
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs864510
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 864510: Remove big Firefox logo. [r=mfinkle]
mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
mobile/android/base/resources/layout/abouthome_content.xml
--- a/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
+++ b/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
@@ -17,24 +17,16 @@
 
         <LinearLayout android:orientation="vertical"
                       android:layout_width="0dp"
                       android:layout_height="fill_parent"
                       android:layout_weight="0.6"
                       android:layout_marginLeft="@dimen/abouthome_gutter_large"
                       android:layout_marginRight="@dimen/abouthome_gutter_small">
 
-            <Gecko.ImageView android:id="@+id/abouthome_logo"
-                             android:src="@drawable/abouthome_logo"
-                             android:layout_width="wrap_content"
-                             android:layout_height="24dip"
-                             android:layout_marginTop="16dip"
-                             android:layout_marginBottom="10dip"
-                             android:layout_marginLeft="12dip"/>
-
             <Gecko.TextView android:id="@+id/top_sites_title"
                             android:text="@string/abouthome_top_sites_title"
                             android:layout_width="fill_parent"
                             android:layout_height="26dip"
                             android:background="#34FFFFFF"
                             android:paddingLeft="12dip"
                             android:textSize="12sp"
                             android:textColor="@color/abouthome_section_title"
@@ -57,57 +49,41 @@
                             android:clickable="true"
                             android:textSize="16sp"
                             android:textColor="#FFFFFF"
                             android:visibility="gone"
                             android:focusable="true"/>
 
         </LinearLayout>
 
-        <RelativeLayout android:layout_width="0dp"
-                        android:layout_height="fill_parent"
-                        android:layout_weight="0.4"
-                        android:layout_marginLeft="@dimen/abouthome_gutter_small"
-                        android:layout_marginRight="@dimen/abouthome_gutter_large">
-
-            <ImageView android:src="@drawable/abouthome_icon"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_marginTop="4dp"
-                       android:layout_alignParentTop="true"
-                       android:layout_alignParentRight="true"/>
+        <LinearLayout android:layout_width="0dp"
+                      android:layout_height="fill_parent"
+                      android:layout_weight="0.4"
+                      android:orientation="vertical"
+                      android:layout_marginLeft="@dimen/abouthome_gutter_small"
+                      android:layout_marginRight="@dimen/abouthome_gutter_large">
 
-            <!-- marginTop is abouthome_logo height & vertical margins: 24dip + 16dip + 10dip = 50dip -->
-            <LinearLayout android:orientation="vertical"
-                          android:layout_width="fill_parent"
-                          android:layout_height="fill_parent"
-                          android:layout_alignParentTop="true"
-                          android:layout_alignParentLeft="true"
-                          android:layout_marginTop="50dip">
+            <Gecko.LastTabsSection android:id="@+id/last_tabs"
+                                   android:layout_width="fill_parent"
+                                   android:layout_height="wrap_content"
+                                   android:visibility="gone"
+                                   gecko:title="@string/abouthome_last_tabs_title"
+                                   gecko:more_text="@string/abouthome_last_tabs_open"/>
 
-                <Gecko.LastTabsSection android:id="@+id/last_tabs"
-                                       android:layout_width="fill_parent"
-                                       android:layout_height="wrap_content"
-                                       android:visibility="gone"
-                                       gecko:title="@string/abouthome_last_tabs_title"
-                                       gecko:more_text="@string/abouthome_last_tabs_open"/>
+            <Gecko.AddonsSection android:id="@+id/recommended_addons"
+                                 android:layout_width="fill_parent"
+                                 android:layout_height="wrap_content"
+                                 android:visibility="gone"
+                                 gecko:title="@string/abouthome_addons_title"
+                                 gecko:more_text="@string/abouthome_addons_browse"/>
 
-                <Gecko.AddonsSection android:id="@+id/recommended_addons"
+            <Gecko.RemoteTabsSection android:id="@+id/remote_tabs"
                                      android:layout_width="fill_parent"
                                      android:layout_height="wrap_content"
                                      android:visibility="gone"
-                                     gecko:title="@string/abouthome_addons_title"
-                                     gecko:more_text="@string/abouthome_addons_browse"/>
+                                     gecko:title="@string/remote_tabs"
+                                     gecko:more_text="@string/remote_tabs_show_all"/>
 
-                <Gecko.RemoteTabsSection android:id="@+id/remote_tabs"
-                                         android:layout_width="fill_parent"
-                                         android:layout_height="wrap_content"
-                                         android:visibility="gone"
-                                         gecko:title="@string/remote_tabs"
-                                         gecko:more_text="@string/remote_tabs_show_all"/>
-
-            </LinearLayout>
-
-        </RelativeLayout>
+        </LinearLayout>
 
     </LinearLayout>
 
 </org.mozilla.gecko.widget.AboutHomeView>
--- a/mobile/android/base/resources/layout/abouthome_content.xml
+++ b/mobile/android/base/resources/layout/abouthome_content.xml
@@ -5,93 +5,68 @@
 
 <org.mozilla.gecko.widget.AboutHomeView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:gecko="http://schemas.android.com/apk/res-auto"
         android:id="@+id/abouthome_content"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
 
-    <RelativeLayout android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:paddingLeft="@dimen/abouthome_gutter_large"
-                    android:paddingRight="@dimen/abouthome_gutter_large">
-
-        <Gecko.ImageView android:id="@+id/abouthome_logo"
-                         android:src="@drawable/abouthome_logo"
-                         android:layout_width="wrap_content"
-                         android:layout_height="24dip"
-                         android:layout_marginTop="16dip"
-                         android:layout_marginBottom="10dip"
-                         android:layout_marginLeft="12dip"
-                         android:layout_alignParentTop="true"
-                         android:layout_alignParentLeft="true"/>
+    <LinearLayout android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical"
+                  android:paddingLeft="@dimen/abouthome_gutter_large"
+                  android:paddingRight="@dimen/abouthome_gutter_large">
 
         <Gecko.TextView android:id="@+id/top_sites_title"
                         android:text="@string/abouthome_top_sites_title"
                         android:layout_width="fill_parent"
                         android:layout_height="26dip"
                         android:background="#34FFFFFF"
                         android:paddingLeft="12dip"
                         android:textSize="12sp"
                         android:textColor="@color/abouthome_section_title"
                         android:textStyle="bold"
-                        android:gravity="left|center_vertical"
-                        android:layout_below="@id/abouthome_logo"/>
+                        android:gravity="left|center_vertical"/>
 
-        <ImageView android:src="@drawable/abouthome_icon"
-                   android:layout_width="180dp"
-                   android:layout_height="153dp"
-                   android:layout_marginTop="4dp"
-                   android:layout_marginRight="@dimen/abouthome_icon_crop"
-                   android:layout_alignParentTop="true"
-                   android:layout_alignParentRight="true"/>
-
-        <LinearLayout android:orientation="vertical"
-                      android:layout_width="fill_parent"
-                      android:layout_height="fill_parent"
-                      android:layout_below="@id/top_sites_title">
-
-            <Gecko.TopSitesView android:id="@+id/top_sites_grid"
-                                style="@style/AboutHome.Thumbnail.Grid"/>
+        <Gecko.TopSitesView android:id="@+id/top_sites_grid"
+                            style="@style/AboutHome.Thumbnail.Grid"/>
 
-            <Gecko.PromoBox android:id="@+id/promo_box"
-                            android:background="@drawable/abouthome_promo_box"
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="12dp"
-                            android:layout_marginRight="12dp"
-                            android:layout_marginTop="17dp"
-                            android:layout_marginBottom="14dp"
-                            android:drawablePadding="7dp"
-                            android:gravity="center"
-                            android:clickable="true"
-                            android:textSize="16sp"
-                            android:textColor="#FFFFFF"
-                            android:visibility="gone"
-                            android:focusable="true"/>
+        <Gecko.PromoBox android:id="@+id/promo_box"
+                        android:background="@drawable/abouthome_promo_box"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="12dp"
+                        android:layout_marginRight="12dp"
+                        android:layout_marginTop="17dp"
+                        android:layout_marginBottom="14dp"
+                        android:drawablePadding="7dp"
+                        android:gravity="center"
+                        android:clickable="true"
+                        android:textSize="16sp"
+                        android:textColor="#FFFFFF"
+                        android:visibility="gone"
+                        android:focusable="true"/>
 
-            <Gecko.LastTabsSection android:id="@+id/last_tabs"
-                                   android:layout_width="fill_parent"
-                                   android:layout_height="wrap_content"
-                                   android:visibility="gone"
-                                   gecko:title="@string/abouthome_last_tabs_title"
-                                   gecko:more_text="@string/abouthome_last_tabs_open"/>
+        <Gecko.LastTabsSection android:id="@+id/last_tabs"
+                               android:layout_width="fill_parent"
+                               android:layout_height="wrap_content"
+                               android:visibility="gone"
+                               gecko:title="@string/abouthome_last_tabs_title"
+                               gecko:more_text="@string/abouthome_last_tabs_open"/>
 
-            <Gecko.AddonsSection android:id="@+id/recommended_addons"
+        <Gecko.AddonsSection android:id="@+id/recommended_addons"
+                             android:layout_width="fill_parent"
+                             android:layout_height="wrap_content"
+                             android:visibility="gone"
+                             gecko:title="@string/abouthome_addons_title"
+                             gecko:more_text="@string/abouthome_addons_browse"/>
+
+        <Gecko.RemoteTabsSection android:id="@+id/remote_tabs"
                                  android:layout_width="fill_parent"
                                  android:layout_height="wrap_content"
                                  android:visibility="gone"
-                                 gecko:title="@string/abouthome_addons_title"
-                                 gecko:more_text="@string/abouthome_addons_browse"/>
+                                 gecko:title="@string/remote_tabs"
+                                 gecko:more_text="@string/remote_tabs_show_all"/>
 
-            <Gecko.RemoteTabsSection android:id="@+id/remote_tabs"
-                                     android:layout_width="fill_parent"
-                                     android:layout_height="wrap_content"
-                                     android:visibility="gone"
-                                     gecko:title="@string/remote_tabs"
-                                     gecko:more_text="@string/remote_tabs_show_all"/>
-
-        </LinearLayout>
-
-    </RelativeLayout>
+    </LinearLayout>
 
 </org.mozilla.gecko.widget.AboutHomeView>