Bug 706667 - Change indentation of about:home layout files for consistency (r=blassey, a=mfinkle)
authorLucas Rocha <lucasr@mozilla.com>
Tue, 13 Dec 2011 20:15:17 +0000
changeset 84158 65485f06a977a6ebaf35bab1435a7255b83557a2
parent 84157 7604f82c29d0bfcf7e1763fb31587f5cacf1c86f
child 84159 a93bacda40f7ce039dd2dc7d5b4b8bea0028d329
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey, mfinkle
bugs706667
milestone11.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 706667 - Change indentation of about:home layout files for consistency (r=blassey, a=mfinkle)
mobile/android/base/resources/layout/abouthome_addon_list_item.xml
mobile/android/base/resources/layout/abouthome_content.xml
mobile/android/base/resources/layout/abouthome_grid_box.xml
--- a/mobile/android/base/resources/layout/abouthome_addon_list_item.xml
+++ b/mobile/android/base/resources/layout/abouthome_addon_list_item.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content"
-    android:padding="10dip"
-    android:textColor="#FF000000"
-    android:background="@drawable/rounded_grey_border" />
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:padding="10dip"
+          android:textColor="#FF000000"
+          android:background="@drawable/rounded_grey_border"/>
--- a/mobile/android/base/resources/layout/abouthome_content.xml
+++ b/mobile/android/base/resources/layout/abouthome_content.xml
@@ -1,36 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView
-        android:layout_width="fill_parent"
-        android:layout_height="100dip"
-        android:layout_gravity="center_horizontal"
-        android:src="@drawable/icon" />
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dip"
-        android:textColor="#FF202020"
-        android:textStyle="bold"
-        android:text="Recommended Addons"
-        android:isScrollContainer="false" />
-    <ListView
-        android:id="@+id/recommended_addon_list"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:divider="@android:color/transparent"
-        android:isScrollContainer="false"
-        android:dividerHeight="8dip" />
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dip"
-        android:textColor="#FF202020"
-        android:textStyle="bold"
-        android:isScrollContainer="false"
-        android:text="Favorite Sites" />
-    <GridView
-        android:id="@+id/grid"
-        android:layout_width="fill_parent"
-        android:isScrollContainer="false"
-        android:layout_height="wrap_content"/>
+
+    <ImageView android:layout_width="fill_parent"
+               android:layout_height="100dip"
+               android:layout_gravity="center_horizontal"
+               android:src="@drawable/icon"/>
+
+    <TextView android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginTop="10dip"
+              android:textColor="#FF202020"
+              android:textStyle="bold"
+              android:text="Recommended Addons"
+              android:isScrollContainer="false"/>
+
+    <ListView android:id="@+id/recommended_addon_list"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:divider="@android:color/transparent"
+              android:isScrollContainer="false"
+              android:dividerHeight="8dip"/>
+
+    <TextView android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginTop="10dip"
+              android:textColor="#FF202020"
+              android:textStyle="bold"
+              android:isScrollContainer="false"
+              android:text="Favorite Sites"/>
+
+    <GridView android:id="@+id/grid"
+              android:layout_width="fill_parent"
+              android:isScrollContainer="false"
+              android:layout_height="wrap_content"/>
+
 </merge>
--- a/mobile/android/base/resources/layout/abouthome_grid_box.xml
+++ b/mobile/android/base/resources/layout/abouthome_grid_box.xml
@@ -1,41 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="100dip"
-    android:layout_height="150dip"
-    android:padding="6dip"
-    android:gravity="center_horizontal">
-  <LinearLayout
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent"
-      android:background="@drawable/rounded_grey_box" >
-    <ImageView
-        android:id="@+id/screenshot"
-        android:layout_width="fill_parent"
-        android:layout_height="80dip" />
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent" >
-      <ImageView
-          android:id="@+id/bookmark_icon"
-          android:layout_width="16dip"
-          android:layout_height="16dip"
-          android:layout_marginRight="6dip" />
-      <TextView
-          android:id="@+id/bookmark_title"
-          android:singleLine="true"
-          android:textColor="#FF202020"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content" />
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="100dip"
+              android:layout_height="150dip"
+              android:padding="6dip"
+              android:gravity="center_horizontal">
+
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="fill_parent"
+                  android:layout_height="fill_parent"
+                  android:background="@drawable/rounded_grey_box">
+
+        <ImageView android:id="@+id/screenshot"
+                   android:layout_width="fill_parent"
+                   android:layout_height="80dip" />
+
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_height="wrap_content"
+                      android:layout_width="fill_parent">
+
+            <ImageView android:id="@+id/bookmark_icon"
+                       android:layout_width="16dip"
+                       android:layout_height="16dip"
+                       android:layout_marginRight="6dip"/>
+
+            <TextView android:id="@+id/bookmark_title"
+                      android:singleLine="true"
+                      android:textColor="#FF202020"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"/>
+
+        </LinearLayout>
+
+        <TextView android:id="@+id/bookmark_url"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:textColor="#FF202020"
+                  android:singleLine="true"
+                  android:ellipsize="marquee"/>
+
     </LinearLayout>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textColor="#FF202020"
-        android:id="@+id/bookmark_url"
-        android:singleLine="true"
-        android:ellipsize="marquee" />
-  </LinearLayout>
+
 </LinearLayout>