Bug 686528 - (3 of 5) Set padding for about:home tablet layout. r=sriram, a=lsblakk
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 01 Aug 2012 22:23:51 -0400
changeset 100489 75827bc5b1f7832e61c972361a2f2b69bb4b6e1f
parent 100488 3255b76324caf9f686fab4e9acec6cff9ec34c84
child 100490 729013a15c82fe0a7900209eea67c43cba41132c
push id1269
push userryanvm@gmail.com
push dateTue, 14 Aug 2012 01:04:52 +0000
treeherdermozilla-beta@29e0218edeb7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssriram, lsblakk
bugs686528
milestone15.0
Bug 686528 - (3 of 5) Set padding for about:home tablet layout. r=sriram, a=lsblakk
mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in
mobile/android/base/resources/layout/abouthome_content.xml.in
mobile/android/base/resources/values-xlarge-v11/dimens.xml
mobile/android/base/resources/values/dimens.xml
--- a/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in
+++ b/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in
@@ -9,17 +9,19 @@
 
     <LinearLayout android:orientation="horizontal"
                   android:layout_width="fill_parent"
                   android:layout_height="fill_parent">
 
         <LinearLayout android:orientation="vertical"
                       android:layout_width="0dp"
                       android:layout_height="fill_parent"
-                      android:layout_weight="0.6">
+                      android:layout_weight="0.6"
+                      android:layout_marginLeft="@dimen/abouthome_gutter_large"
+                      android:layout_marginRight="@dimen/abouthome_gutter_small">
 
             <ImageView 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"/>
 
@@ -98,17 +100,19 @@
                               android:textColor="#FFFFFF"/>
 
                 </LinearLayout>
 
         </LinearLayout>
 
         <RelativeLayout android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:layout_weight="0.4">
+                        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"/>
 
--- a/mobile/android/base/resources/layout/abouthome_content.xml.in
+++ b/mobile/android/base/resources/layout/abouthome_content.xml.in
@@ -3,17 +3,19 @@
 <!-- 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"
        xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
 
     <RelativeLayout android:layout_width="fill_parent"
-                    android:layout_height="fill_parent">
+                    android:layout_height="fill_parent"
+                    android:paddingLeft="@dimen/abouthome_gutter_large"
+                    android:paddingRight="@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"/>
 
--- a/mobile/android/base/resources/values-xlarge-v11/dimens.xml
+++ b/mobile/android/base/resources/values-xlarge-v11/dimens.xml
@@ -1,15 +1,17 @@
 <?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/. -->
 
 <resources>
 
+    <dimen name="abouthome_gutter_small">20dp</dimen>
+    <dimen name="abouthome_gutter_large">40dp</dimen>
     <dimen name="awesomebar_header_row_height">24dp</dimen>
     <dimen name="awesomebar_row_height">66dp</dimen>
     <dimen name="awesomebar_suggestion_item_height">32dp</dimen>
     <dimen name="awesomebar_tab_transparency_height">46dp</dimen>
     <dimen name="browser_toolbar_height">56dp</dimen>
     <dimen name="local_tab_row_height">150dp</dimen>
     <dimen name="remote_tab_child_row_height">48dp</dimen>
     <dimen name="remote_tab_group_row_height">28dp</dimen>
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -1,15 +1,17 @@
 <?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/. -->
 
 <resources>
 
+    <dimen name="abouthome_gutter_small">0dp</dimen>
+    <dimen name="abouthome_gutter_large">0dp</dimen>
     <dimen name="awesomebar_header_row_height">20dp</dimen>
     <dimen name="awesomebar_row_height">48dp</dimen>
     <dimen name="awesomebar_tab_transparency_height">38dp</dimen>
     <dimen name="browser_toolbar_height">48dp</dimen>
     <dimen name="flow_layout_spacing">6dp</dimen>
     <dimen name="local_tab_row_height">108dp</dimen>
     <dimen name="remote_tab_child_row_height">54dp</dimen>
     <dimen name="remote_tab_group_row_height">26dp</dimen>