From ef86905c58aff18afd2a1da1fe86e5adcab6d125 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Fri, 21 Oct 2011 17:57:38 -0700
Subject: [PATCH] Fix comment for 483b954b8878

---
 MyTracks/res/layout/chart_settings.xml            | 11 +----------
 MyTracks/res/layout/mytracks_detail.xml           | 11 +----------
 MyTracks/res/layout/mytracks_list.xml             | 11 +----------
 MyTracks/res/layout/mytracks_send_to_google.xml   | 11 +----------
 MyTracks/res/layout/mytracks_waypoint_details.xml | 11 +----------
 MyTracks/res/layout/mytracks_waypoints_list.xml   | 11 +----------
 MyTracks/res/layout/welcome.xml                   | 11 +----------
 MyTracks/res/values/styles.xml                    | 13 ++++++++++++-
 8 files changed, 19 insertions(+), 71 deletions(-)

diff --git a/MyTracks/res/layout/chart_settings.xml b/MyTracks/res/layout/chart_settings.xml
index a52c36ae1..fb57fefd7 100644
--- a/MyTracks/res/layout/chart_settings.xml
+++ b/MyTracks/res/layout/chart_settings.xml
@@ -122,15 +122,7 @@ limitations under the License.
       </TableRow>
     </TableLayout>
   </ScrollView>
-  <LinearLayout
-    android:background="@drawable/list_bar"
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="horizontal"
-    android:paddingLeft="2dip"
-    android:paddingRight="2dip"    
-    android:paddingTop="4dip">
-    <!-- left spacer -->
+  <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/chart_settings_cancel"
       android:layout_gravity="left"
@@ -140,7 +132,6 @@ limitations under the License.
       android:layout_gravity="right"
       android:text="@string/ok"
       style="@style/Button"/>
-    <!--  right spacer -->
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_detail.xml b/MyTracks/res/layout/mytracks_detail.xml
index eeb3f0869..f950d1408 100644
--- a/MyTracks/res/layout/mytracks_detail.xml
+++ b/MyTracks/res/layout/mytracks_detail.xml
@@ -68,15 +68,7 @@ limitations under the License.
     android:layout_weight="1"
     android:hint="@string/trackdetails_description_hint"
     android:imeOptions="actionDone"/>
-  <LinearLayout
-    android:background="@drawable/list_bar"
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="horizontal"
-    android:paddingLeft="2dip"
-    android:paddingRight="2dip"    
-    android:paddingTop="4dip">
-    <!-- left spacer -->
+  <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/trackdetails_cancel"
       android:layout_gravity="left"
@@ -86,7 +78,6 @@ limitations under the License.
       android:layout_gravity="right"
       android:text="@string/save"
       style="@style/Button"/>
-    <!--  right spacer -->
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_list.xml b/MyTracks/res/layout/mytracks_list.xml
index 83ac66fdd..3f3144c19 100644
--- a/MyTracks/res/layout/mytracks_list.xml
+++ b/MyTracks/res/layout/mytracks_list.xml
@@ -39,15 +39,7 @@ limitations under the License.
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_weight="1"/>
-  <LinearLayout
-    android:background="@drawable/list_bar"
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="horizontal"
-    android:paddingLeft="2dip"
-    android:paddingRight="2dip"    
-    android:paddingTop="4dip">
-    <!-- left spacer -->
+  <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/tracklist_btn_import_all"
       android:layout_gravity="left"
@@ -61,7 +53,6 @@ limitations under the License.
       android:layout_gravity="right"
       android:text="@string/tracklist_btn_delete_all"
       style="@style/Button"/>
-    <!--  right spacer -->
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_send_to_google.xml b/MyTracks/res/layout/mytracks_send_to_google.xml
index 2589c61b1..5d101b7fe 100644
--- a/MyTracks/res/layout/mytracks_send_to_google.xml
+++ b/MyTracks/res/layout/mytracks_send_to_google.xml
@@ -126,15 +126,7 @@ limitations under the License.
       </TableRow>
     </TableLayout>
   </ScrollView>
-  <LinearLayout
-    android:background="@drawable/list_bar"
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="horizontal"
-    android:paddingLeft="2dip"
-    android:paddingRight="2dip"    
-    android:paddingTop="4dip">
-    <!-- left spacer -->
+  <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/sendtogoogle_cancel"
       android:layout_gravity="left"
@@ -144,7 +136,6 @@ limitations under the License.
       android:layout_gravity="right"
       android:text="@string/sendtogoogle_send_now"
       style="@style/Button"/>
-    <!--  right spacer -->
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_waypoint_details.xml b/MyTracks/res/layout/mytracks_waypoint_details.xml
index b1d9bab0b..04faf8833 100644
--- a/MyTracks/res/layout/mytracks_waypoint_details.xml
+++ b/MyTracks/res/layout/mytracks_waypoint_details.xml
@@ -487,15 +487,7 @@ limitations under the License.
       </TableLayout>
     </LinearLayout>
   </ScrollView>
-  <LinearLayout
-    android:background="@drawable/list_bar"
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="horizontal"
-    android:paddingLeft="2dip"
-    android:paddingRight="2dip"    
-    android:paddingTop="4dip">
-    <!-- left spacer -->
+  <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/waypointdetails_cancel"
       android:layout_gravity="left"
@@ -505,7 +497,6 @@ limitations under the License.
       android:layout_gravity="right"
       android:text="@string/save"
       style="@style/Button"/>
-    <!--  right spacer -->
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_waypoints_list.xml b/MyTracks/res/layout/mytracks_waypoints_list.xml
index 0d2e188fa..f6773807f 100644
--- a/MyTracks/res/layout/mytracks_waypoints_list.xml
+++ b/MyTracks/res/layout/mytracks_waypoints_list.xml
@@ -40,15 +40,7 @@ limitations under the License.
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_weight="1"/>
-  <LinearLayout
-    android:background="@drawable/list_bar"
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="horizontal"
-    android:paddingLeft="2dip"
-    android:paddingRight="2dip"    
-    android:paddingTop="4dip">
-    <!-- left spacer -->
+  <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/waypointslist_btn_insert_statistics"
       android:layout_gravity="left"
@@ -58,7 +50,6 @@ limitations under the License.
       android:layout_gravity="right"
       android:text="@string/waypointslist_btn_insert_waypoint"
       style="@style/Button"/>
-    <!--  right spacer -->
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/MyTracks/res/layout/welcome.xml b/MyTracks/res/layout/welcome.xml
index 53a29bbd4..201ad459f 100644
--- a/MyTracks/res/layout/welcome.xml
+++ b/MyTracks/res/layout/welcome.xml
@@ -24,15 +24,7 @@ limitations under the License.
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:layout_weight="1" />
-  <LinearLayout
-    android:background="@drawable/list_bar"
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="horizontal"
-    android:paddingLeft="2dip"
-    android:paddingRight="2dip"    
-    android:paddingTop="4dip">
-    <!-- left spacer -->
+  <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/welcome_about"
       android:layout_gravity="left"
@@ -42,7 +34,6 @@ limitations under the License.
       android:layout_gravity="right"
       android:text="@string/welcome_read_later"
       style="@style/Button"/>
-    <!--  right spacer -->
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index 46ce5aa2c..6b09d846e 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -86,7 +86,18 @@ limitations under the License.
     <item name="android:width">160px</item>
   </style>
   
-  <!-- The style for the bottom buttons. -->
+  <!-- The style for the layout of the bottom buttons. -->
+  <style name="ButtonLayout">
+    <item name="android:background">@drawable/list_bar</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:orientation">horizontal</item>
+    <item name="android:paddingLeft">2dip</item>
+    <item name="android:paddingRight">2dip</item>
+    <item name="android:paddingTop">4dip</item>
+  </style>
+    
+  <!-- The style for the bottom button. -->
   <style name="Button">
     <item name="android:layout_height">48dip</item>
     <item name="android:layout_weight">1</item>