Bug 745225: about:home rows should have orange highlight. [r=mfinkle] [a=lsblakk]
authorSriram Ramasubramanian <sriram@mozilla.com>
Mon, 23 Jul 2012 16:06:30 -0700
changeset 100308 6ae50075c6888c2f76733d44b9b11e08e0ca4cb3
parent 100307 1eb1fcefd5ae2bc8a50e0adcba5cb56dd2e4be54
child 100309 063ec1713c938c65069577901fb7a71b9a33329f
push id1149
push usersramasubramanian@mozilla.com
push dateMon, 23 Jul 2012 23:17:02 +0000
treeherdermozilla-beta@a37741b342b5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle, lsblakk
bugs745225
milestone15.0
Bug 745225: about:home rows should have orange highlight. [r=mfinkle] [a=lsblakk]
mobile/android/base/AboutHomeContent.java
mobile/android/base/AboutHomeSection.java
mobile/android/base/Makefile.in
mobile/android/base/resources/drawable-hdpi/abouthome_separator.9.png
mobile/android/base/resources/drawable-xhdpi/abouthome_separator.9.png
mobile/android/base/resources/drawable/abouthome_divider.xml
mobile/android/base/resources/drawable/abouthome_separator.9.png
mobile/android/base/resources/layout/abouthome_addon_row.xml
mobile/android/base/resources/layout/abouthome_content.xml.in
mobile/android/base/resources/layout/abouthome_last_tabs_row.xml
mobile/android/base/resources/layout/abouthome_remote_tab_row.xml
mobile/android/base/resources/layout/abouthome_section.xml
mobile/android/base/resources/layout/abouthome_section_moretext.xml
mobile/android/base/resources/layout/abouthome_section_subtitle.xml
mobile/android/base/resources/layout/abouthome_section_title.xml
mobile/android/base/resources/layout/abouthome_topsite_item.xml
--- a/mobile/android/base/AboutHomeContent.java
+++ b/mobile/android/base/AboutHomeContent.java
@@ -568,17 +568,17 @@ public class AboutHomeContent extends Sc
             GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
                 public void run() {
                     View container = mInflater.inflate(R.layout.abouthome_last_tabs_row, mLastTabs.getItemsContainer(), false);
                     ((TextView) container.findViewById(R.id.last_tab_title)).setText(title);
                     ((TextView) container.findViewById(R.id.last_tab_url)).setText(url);
                     if (favicon != null)
                         ((ImageView) container.findViewById(R.id.last_tab_favicon)).setImageDrawable(favicon);
 
-                    container.findViewById(R.id.last_tab_row).setOnClickListener(new View.OnClickListener() {
+                    container.setOnClickListener(new View.OnClickListener() {
                         public void onClick(View v) {
                             GeckoApp.mAppContext.loadUrlInTab(url);
                         }
                     });
 
                     mLastTabs.addItem(container);
                 }
             });
@@ -630,18 +630,18 @@ public class AboutHomeContent extends Sc
         String client = null;
         
         for (TabsAccessor.RemoteTab tab : tabs) {
             if (client == null)
                 client = tab.name;
             else if (!TextUtils.equals(client, tab.name))
                 break;
 
-            final TextView row = (TextView) mInflater.inflate(R.layout.abouthome_remote_tab_row, mRemoteTabs.getItemsContainer(), false);
-            row.setText(TextUtils.isEmpty(tab.title) ? tab.url : tab.title);
+            final RelativeLayout row = (RelativeLayout) mInflater.inflate(R.layout.abouthome_remote_tab_row, mRemoteTabs.getItemsContainer(), false);
+            ((TextView) row.findViewById(R.id.remote_tab_title)).setText(TextUtils.isEmpty(tab.title) ? tab.url : tab.title);
             row.setTag(tab.url);
             mRemoteTabs.addItem(row);
             row.setOnClickListener(mRemoteTabClickListener);
         }
         
         mRemoteTabs.setSubtitle(client);
         mRemoteTabs.show();
     }
--- a/mobile/android/base/AboutHomeSection.java
+++ b/mobile/android/base/AboutHomeSection.java
@@ -6,39 +6,38 @@ package org.mozilla.gecko;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
 import android.text.TextUtils;
 
 public class AboutHomeSection extends LinearLayout {
     private static final String LOGTAG = "GeckoAboutHomeSection";
 
-    private TextView mTitle;
-    private TextView mSubtitle;
+    private TitleView mTitle;
+    private SubTitleView mSubtitle;
     private LinearLayout mItemsContainer;
-    private LinkTextView mMoreText;
+    private MoreTextView mMoreText;
 
     public AboutHomeSection(Context context, AttributeSet attrs) {
         super(context, attrs);
 
         setOrientation(VERTICAL);
 
         LayoutInflater.from(context).inflate(R.layout.abouthome_section, this);
 
-        mTitle = (TextView) this.findViewById(R.id.title);
-        mSubtitle = (TextView) this.findViewById(R.id.subtitle);
+        mTitle = (TitleView) this.findViewById(R.id.title);
+        mSubtitle = (SubTitleView) this.findViewById(R.id.subtitle);
         mItemsContainer = (LinearLayout) this.findViewById(R.id.items_container);
-        mMoreText = (LinkTextView) this.findViewById(R.id.more_text);
+        mMoreText = (MoreTextView) this.findViewById(R.id.more_text);
 
         TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.AboutHomeSection);
         setTitle(a.getText(R.styleable.AboutHomeSection_title));
         setSubtitle(a.getText(R.styleable.AboutHomeSection_subtitle));
         setMoreText(a.getText(R.styleable.AboutHomeSection_more_text));
         a.recycle();
     }
 
@@ -95,9 +94,60 @@ public class AboutHomeSection extends Li
 
     public void showMoreText() {
         mMoreText.setVisibility(View.VISIBLE);
     }
 
     public void hideMoreText() {
         mMoreText.setVisibility(View.GONE);
     }
+
+    public static class TitleView extends LinearLayout {
+        private TextView mText;
+
+        public TitleView(Context context, AttributeSet attrs) {
+            super(context, attrs);
+            setOrientation(LinearLayout.VERTICAL);
+
+            inflate(context, R.layout.abouthome_section_title, this);
+
+            mText = (TextView) findViewById(R.id.text);
+        }
+
+        public void setText(CharSequence text) {
+            mText.setText(text);
+        }
+    }
+
+    public static class SubTitleView extends LinearLayout {
+        private TextView mText;
+
+        public SubTitleView(Context context, AttributeSet attrs) {
+            super(context, attrs);
+            setOrientation(LinearLayout.VERTICAL);
+
+            inflate(context, R.layout.abouthome_section_subtitle, this);
+
+            mText = (TextView) findViewById(R.id.text);
+        }
+
+        public void setText(CharSequence text) {
+            mText.setText(text);
+        }
+    }
+
+    public static class MoreTextView extends LinearLayout {
+        private TextView mText;
+
+        public MoreTextView(Context context, AttributeSet attrs) {
+            super(context, attrs);
+            setOrientation(LinearLayout.VERTICAL);
+
+            inflate(context, R.layout.abouthome_section_moretext, this);
+
+            mText = (TextView) findViewById(R.id.text);
+        }
+
+        public void setText(CharSequence text) {
+            mText.setText(text);
+        }
+    }
 }
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -284,16 +284,19 @@ RES_LAYOUT = \
   res/layout/tabs_panel_toolbar_menu.xml \
   res/layout/tabs_row.xml \
   res/layout/tabs_tray.xml \
   res/layout/list_item_header.xml \
   res/layout/select_dialog_list.xml \
   res/layout/abouthome_addon_row.xml \
   res/layout/abouthome_last_tabs_row.xml \
   res/layout/abouthome_section.xml \
+  res/layout/abouthome_section_moretext.xml \
+  res/layout/abouthome_section_subtitle.xml \
+  res/layout/abouthome_section_title.xml \
   res/layout/abouthome_remote_tab_row.xml \
   res/layout/abouthome_topsite_item.xml \
   res/layout/validation_message.xml \
   $(NULL)
 
 RES_LAYOUT_LAND_V14 = \
   res/layout-land-v14/browser_toolbar.xml \
   res/layout-land-v14/browser_toolbar_menu.xml \
@@ -362,17 +365,16 @@ RES_DRAWABLE_NODPI = \
   res/drawable-nodpi/tabs_tray_selected_bg.png \
   $(NULL)
 
 RES_DRAWABLE_BASE = \
   res/drawable/favicon.png \
   res/drawable/folder.png \
   res/drawable/abouthome_icon.png \
   res/drawable/abouthome_logo.png \
-  res/drawable/abouthome_separator.9.png \
   res/drawable/abouthome_sync_logo.png \
   res/drawable/abouthome_sync_bg.9.png \
   res/drawable/abouthome_sync_pressed_bg.9.png \
   res/drawable/abouthome_thumbnail.png \
   res/drawable/address_bar_bg_shadow.png \
   res/drawable/alert_addon.png \
   res/drawable/alert_app.png \
   res/drawable/alert_download.png \
@@ -442,17 +444,16 @@ RES_DRAWABLE_LDPI = \
 
 RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/favicon.png \
   res/drawable-hdpi/folder.png \
   res/drawable-hdpi/home_bg.png \
   res/drawable-hdpi/home_star.png \
   res/drawable-hdpi/abouthome_icon.png \
   res/drawable-hdpi/abouthome_logo.png \
-  res/drawable-hdpi/abouthome_separator.9.png \
   res/drawable-hdpi/abouthome_sync_logo.png \
   res/drawable-hdpi/abouthome_sync_bg.9.png \
   res/drawable-hdpi/abouthome_sync_pressed_bg.9.png \
   res/drawable-hdpi/abouthome_thumbnail.png \
   res/drawable-hdpi/address_bar_bg_shadow.png \
   res/drawable-hdpi/alert_addon.png \
   res/drawable-hdpi/alert_app.png \
   res/drawable-hdpi/alert_download.png \
@@ -504,17 +505,16 @@ RES_DRAWABLE_HDPI = \
   $(addprefix res/drawable-hdpi/,$(notdir $(SYNC_RES_DRAWABLE_HDPI))) \
   $(NULL)
 
 RES_DRAWABLE_XHDPI = \
   res/drawable-xhdpi/favicon.png \
   res/drawable-xhdpi/folder.png \
   res/drawable-xhdpi/abouthome_icon.png \
   res/drawable-xhdpi/abouthome_logo.png \
-  res/drawable-xhdpi/abouthome_separator.9.png \
   res/drawable-xhdpi/abouthome_sync_logo.png \
   res/drawable-xhdpi/abouthome_sync_bg.9.png \
   res/drawable-xhdpi/abouthome_sync_pressed_bg.9.png \
   res/drawable-xhdpi/abouthome_thumbnail.png \
   res/drawable-xhdpi/address_bar_bg_curve.png \
   res/drawable-xhdpi/address_bar_bg_shadow.png \
   res/drawable-xhdpi/address_bar_texture_port.png \
   res/drawable-xhdpi/address_bar_url_default.9.png \
@@ -824,16 +824,17 @@ ifdef MOZ_CRASHREPORTER
 FENNEC_PP_JAVA_FILES += CrashReporter.java
 MOZ_ANDROID_DRAWABLES += mobile/android/base/resources/drawable/crash_reporter.png
 RES_LAYOUT += res/layout/crash_reporter.xml
 endif
 
 MOZ_ANDROID_DRAWABLES += \
   $(SYNC_RES_DRAWABLE)                                                          \
   mobile/android/base/resources/drawable/abouthome_bg_repeat.xml                \
+  mobile/android/base/resources/drawable/abouthome_divider.xml                  \
   mobile/android/base/resources/drawable/abouthome_sync_box.xml                 \
   mobile/android/base/resources/drawable/abouthome_topsites_bg_repeat.xml       \
   mobile/android/base/resources/drawable/action_bar_button.xml                  \
   mobile/android/base/resources/drawable/address_bar_bg.xml                     \
   mobile/android/base/resources/drawable/address_bar_bg_shadow_repeat.xml       \
   mobile/android/base/resources/drawable/autocomplete_list_bg.9.png             \
   mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml           \
   mobile/android/base/resources/drawable/awesomebar_tab_selected.xml            \
deleted file mode 100644
index bab5b026fb8029f56f4e4c5ac3c9fbc4c62f9e23..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 835d47cf69b91788465037b130709c27dde6662b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/resources/drawable/abouthome_divider.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+
+        <shape android:shape="rectangle">
+             <size android:height="1dp"/>
+             <solid android:color="#C1C7CC"/>
+        </shape>
+
+    </item>
+
+    <item android:top="1dp">
+
+        <shape android:shape="rectangle">
+             <size android:height="1dp"/>
+             <solid android:color="#FFFFFF"/>
+        </shape>
+
+    </item>
+
+</layer-list>
deleted file mode 100644
index bab5b026fb8029f56f4e4c5ac3c9fbc4c62f9e23..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/android/base/resources/layout/abouthome_addon_row.xml
+++ b/mobile/android/base/resources/layout/abouthome_addon_row.xml
@@ -2,37 +2,42 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="fill_parent"
                 android:layout_height="47dip"
                 android:gravity="left|center_vertical"
-                android:background="@drawable/abouthome_separator">
+                android:background="@drawable/action_bar_button">
 
     <ImageView android:id="@+id/addon_icon"
                android:layout_width="32dp"
                android:layout_height="32dp"
                android:layout_centerVertical="true"
                android:layout_marginLeft="12dip"
                android:src="@drawable/ic_addons_empty"/>
 
     <TextView android:id="@+id/addon_title"
               android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
+              android:layout_height="fill_parent"
               android:layout_toRightOf="@id/addon_icon"
               android:layout_marginLeft="12dip"
-              android:layout_centerVertical="true"
+              android:gravity="center_vertical"
               android:textSize="15sp"
               android:textColor="#222222"/>
 
     <TextView android:id="@+id/addon_version"
               android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_centerVertical="true"
+              android:layout_height="fill_parent"
               android:layout_toRightOf="@id/addon_title"
               android:layout_alignBottom="@id/addon_title"
               android:layout_marginLeft="5dip"
+              android:gravity="center_vertical"
               android:textSize="12sp"
               android:textColor="#666666"/>
 
+    <View android:layout_width="fill_parent"
+          android:layout_height="2dp"
+          android:background="@drawable/abouthome_divider"
+          android:layout_alignParentBottom="true"/>
+
 </RelativeLayout>
--- a/mobile/android/base/resources/layout/abouthome_content.xml.in
+++ b/mobile/android/base/resources/layout/abouthome_content.xml.in
@@ -120,16 +120,21 @@
                        android:layout_height="wrap_content"
                        android:layout_marginTop="16dip"
                        android:layout_marginBottom="10dip"
                        android:layout_marginLeft="12dip"
                        android:layout_alignParentTop="true"
                        android:layout_alignParentLeft="true"
                        android:src="@drawable/abouthome_logo"/>
 
+            <View android:layout_width="fill_parent"
+                  android:layout_height="2dp"
+                  android:background="@drawable/abouthome_divider"
+                  android:layout_alignParentBottom="true"/>
+
         </RelativeLayout>
 
         <org.mozilla.gecko.AboutHomeSection 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"/>
--- a/mobile/android/base/resources/layout/abouthome_last_tabs_row.xml
+++ b/mobile/android/base/resources/layout/abouthome_last_tabs_row.xml
@@ -1,56 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="fill_parent"
-             android:layout_height="wrap_content"
-             android:background="@drawable/abouthome_separator">
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="fill_parent"
+                android:layout_height="47dip"
+                android:gravity="left|center_vertical"
+                android:background="@drawable/action_bar_button">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:id="@+id/last_tab_row"
-                  android:layout_width="fill_parent"
-                  android:layout_height="47dip"
-                  android:paddingLeft="12dip"
-                  android:paddingRight="12dip"
-                  android:gravity="center_vertical"
-                  android:background="@android:drawable/list_selector_background"
-                  android:orientation="horizontal"
-                  android:clickable="true">
-
-        <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-                   android:id="@+id/last_tab_favicon"
-                   android:layout_width="32dip"
-                   android:layout_height="32dip"
-                   android:src="@drawable/favicon"
-                   android:layout_centerVertical="true"/>
+    <ImageView android:id="@+id/last_tab_favicon"
+               android:layout_width="32dip"
+               android:layout_height="32dip"
+               android:layout_centerVertical="true"
+               android:layout_marginLeft="12dip"
+               android:src="@drawable/favicon"/>
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:paddingLeft="10dip"
-                      android:orientation="vertical">
-
-            <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-                      android:id="@+id/last_tab_title"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:textSize="15sp"
-                      android:singleLine="true"
-                      android:textColor="#222222"/>
+    <TextView android:id="@+id/last_tab_title"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_toRightOf="@id/last_tab_favicon"
+              android:layout_marginLeft="12dip"
+              android:layout_marginRight="12dip"
+              android:textSize="15sp"
+              android:singleLine="true"
+              android:textColor="#222222"/>
 
-            <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-                      android:id="@+id/last_tab_url"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:textSize="12sp"
-                      android:singleLine="true"
-                      android:layout_marginTop="-2dip"
-                      android:textColor="#666666"/>
+    <TextView android:id="@+id/last_tab_url"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="12dip"
+              android:layout_marginRight="12dip"
+              android:layout_toRightOf="@id/last_tab_favicon"
+              android:layout_below="@id/last_tab_title"
+              android:textSize="12sp"
+              android:singleLine="true"
+              android:textColor="#666666"/>
 
-        </LinearLayout>
+    <View android:layout_width="fill_parent"
+          android:layout_height="2dp"
+          android:background="@drawable/abouthome_divider"
+          android:layout_alignParentBottom="true"/>
 
-    </LinearLayout>
-
-</FrameLayout>
+</RelativeLayout>
--- a/mobile/android/base/resources/layout/abouthome_remote_tab_row.xml
+++ b/mobile/android/base/resources/layout/abouthome_remote_tab_row.xml
@@ -1,17 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          android:id="@+id/remote_tab_title"
-          android:layout_width="fill_parent"
-          android:layout_height="47dip"
-          android:paddingLeft="12dip"
-          android:paddingRight="12dip"
-          android:gravity="center_vertical"
-          android:textSize="15sp"
-          android:textColor="#222222"
-          android:singleLine="true"
-          android:ellipsize="middle"
-          android:background="@drawable/abouthome_separator"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="fill_parent"
+                android:layout_height="47dip"
+                android:orientation="vertical"
+                android:background="@drawable/action_bar_button">
+
+    <TextView android:id="@+id/remote_tab_title"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:paddingLeft="12dip"
+              android:paddingRight="12dip"
+              android:gravity="center_vertical"
+              android:textSize="15sp"
+              android:textColor="#222222"
+              android:singleLine="true"
+              android:ellipsize="middle"/>
+
+    <View android:layout_width="fill_parent"
+          android:layout_height="2dp"
+          android:background="@drawable/abouthome_divider"
+          android:layout_alignParentBottom="true"/>
+
+</RelativeLayout>
--- a/mobile/android/base/resources/layout/abouthome_section.xml
+++ b/mobile/android/base/resources/layout/abouthome_section.xml
@@ -1,41 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <TextView android:id="@+id/title"
-              android:layout_width="fill_parent"
-              android:layout_height="26dip"
-              android:paddingLeft="12dip"
-              android:background="@drawable/abouthome_separator"
-              android:textSize="12sp"
-              android:textColor="#000000"
-              android:textStyle="bold"
-              android:gravity="left|center_vertical"/>
+    <view class="org.mozilla.gecko.AboutHomeSection$TitleView"
+          android:id="@+id/title"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"/>
 
-    <TextView android:id="@+id/subtitle"
-              android:layout_width="fill_parent"
-              android:layout_height="26dip"
-              android:paddingLeft="12dip"
-              android:background="@drawable/abouthome_separator"
-              android:textSize="12sp"
-              android:textColor="#666666"
-              android:gravity="left|center_vertical"/>
+    <view class="org.mozilla.gecko.AboutHomeSection$SubTitleView"
+          android:id="@+id/subtitle"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"/>
 
     <LinearLayout android:id="@+id/items_container"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:orientation="vertical"
                   android:isScrollContainer="false"/>
 
-    <org.mozilla.gecko.LinkTextView android:id="@+id/more_text"
-                                    android:layout_width="fill_parent"
-                                    android:layout_height="47dip"
-                                    android:background="@drawable/abouthome_separator"
-                                    android:textColor="#22629e"
-                                    android:textSize="12sp"
-                                    android:gravity="center"/>
+    <view class="org.mozilla.gecko.AboutHomeSection$MoreTextView"
+          android:id="@+id/more_text"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"/>
 
 </merge>
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/resources/layout/abouthome_section_moretext.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <org.mozilla.gecko.LinkTextView android:id="@+id/text"
+                                    android:layout_width="fill_parent"
+                                    android:layout_height="47dip"
+                                    android:textColor="#22629e"
+                                    android:textSize="12sp"
+                                    android:gravity="center"/>
+
+    <View android:layout_width="fill_parent"
+          android:layout_height="2dp"
+          android:background="@drawable/abouthome_divider"/>
+
+</merge>
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/resources/layout/abouthome_section_subtitle.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <TextView android:id="@+id/text"
+              android:layout_width="fill_parent"
+              android:layout_height="26dip"
+              android:paddingLeft="12dip"
+              android:textSize="12sp"
+              android:textColor="#666666"
+              android:gravity="left|center_vertical"/>
+
+    <View android:layout_width="fill_parent"
+          android:layout_height="2dp"
+          android:background="@drawable/abouthome_divider"/>
+
+</merge>
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/resources/layout/abouthome_section_title.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <TextView android:id="@+id/text"
+              android:layout_width="fill_parent"
+              android:layout_height="26dip"
+              android:paddingLeft="12dip"
+              android:textSize="12sp"
+              android:textColor="#000000"
+              android:textStyle="bold"
+              android:gravity="left|center_vertical"/>
+
+    <View android:layout_width="fill_parent"
+          android:layout_height="2dp"
+          android:background="@drawable/abouthome_divider"/>
+
+</merge>
--- a/mobile/android/base/resources/layout/abouthome_topsite_item.xml
+++ b/mobile/android/base/resources/layout/abouthome_topsite_item.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="146dip"
                 android:layout_height="wrap_content"
-                android:paddingTop="4dip">
+                android:paddingTop="4dip"
+                android:background="@drawable/action_bar_button">
 
     <ImageView android:id="@+id/thumbnail"
                android:layout_width="136dip"
                android:layout_height="78dip"
                android:layout_centerHorizontal="true"
                android:paddingTop="2dip"
                android:layout_alignParentTop="true"
                android:src="@drawable/tab_thumbnail_default"
@@ -27,12 +28,12 @@
 
    <TextView android:id="@+id/title"
              android:layout_width="fill_parent"
              android:layout_height="15dip"
              android:layout_marginTop="3dip"
              android:layout_below="@id/shadow"
              android:singleLine="true"
              android:textColor="#000000"
-             android:textSize="9dip"
+             android:textSize="9sp"
              android:gravity="center_horizontal"/>
 
 </RelativeLayout>