Bug 864510: Remove big Firefox logo. [r=mfinkle]

This commit is contained in:
Sriram Ramasubramanian 2013-03-25 15:45:45 -07:00
parent 620941472f
commit 6807c6def7
2 changed files with 61 additions and 110 deletions

View File

@ -22,14 +22,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"
@ -62,51 +54,35 @@
</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">
<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">
<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"/>
<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"/>
<!-- 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.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.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.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>

View File

@ -10,20 +10,11 @@
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"
@ -34,64 +25,48 @@
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"/>
<Gecko.TopSitesView android:id="@+id/top_sites_grid"
style="@style/AboutHome.Thumbnail.Grid"/>
<LinearLayout android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_below="@id/top_sites_title">
<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.TopSitesView android:id="@+id/top_sites_grid"
style="@style/AboutHome.Thumbnail.Grid"/>
<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.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.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.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.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>