From 42c68814940591e5f5b572882efa023c41d15679 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Mon, 10 Jan 2011 14:29:39 -0800
Subject: [PATCH] Remove STOPSHIPs

Bug 3335094
Bug 3335069

Change-Id: I307a762a83ca7fa94cf62f1d80f32a2b3f30b27a
---
 res/layout/message_compose.xml                      | 1 -
 res/values-xlarge-land/dimensions.xml               | 1 -
 res/values-xlarge-port/dimensions.xml               | 3 +--
 res/values-xlarge/styles.xml                        | 1 -
 src/com/android/email/activity/ThreePaneLayout.java | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index b574e17b9..b63e2946d 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -174,7 +174,6 @@
             android:layout_height="match_parent"
             android:layout_width="0dip"
             android:layout_weight="1" />
-        <!-- STOPSHIP Need icon -->
         <Button
             android:id="@+id/add_attachment"
             android:text="@string/add_attachment_action"
diff --git a/res/values-xlarge-land/dimensions.xml b/res/values-xlarge-land/dimensions.xml
index 12704dc14..85ad8def9 100644
--- a/res/values-xlarge-land/dimensions.xml
+++ b/res/values-xlarge-land/dimensions.xml
@@ -16,7 +16,6 @@
 
 <!-- xlarge, landscape -->
 <resources>
-    <!-- message compose STOPSHIP not final -->
     <dimen name="message_compose_paper_width">800dip</dimen>
     <dimen name="message_compose_field_label_width">120dip</dimen>
 
diff --git a/res/values-xlarge-port/dimensions.xml b/res/values-xlarge-port/dimensions.xml
index 0ddec0c31..3a4a0bfc9 100644
--- a/res/values-xlarge-port/dimensions.xml
+++ b/res/values-xlarge-port/dimensions.xml
@@ -16,8 +16,7 @@
 
 <!-- xlarge, portrait -->
 <resources>
-    <!-- message compose STOPSHIP not final -->
-    <dimen name="message_compose_paper_width">700dip</dimen>
+    <dimen name="message_compose_paper_width">700dip</dimen> <!-- STOPSHIP not pixelperfect -->
     <dimen name="message_compose_field_label_width">120dip</dimen>
 
     <!-- XL activity dimensions -->
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index a7dba0349..67dc25420 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -59,7 +59,6 @@
         <item name="android:background">?android:attr/dividerHorizontal</item>
     </style>
 
-    <!-- Message compose STOPSHIP not final -->
     <style name="message_compose_horizontal_divider">
         <item name="android:layout_height">wrap_content</item>
         <item name="android:background">?android:attr/dividerHorizontal</item>
diff --git a/src/com/android/email/activity/ThreePaneLayout.java b/src/com/android/email/activity/ThreePaneLayout.java
index a17cafe1d..34f8307a0 100644
--- a/src/com/android/email/activity/ThreePaneLayout.java
+++ b/src/com/android/email/activity/ThreePaneLayout.java
@@ -44,7 +44,6 @@ import android.widget.LinearLayout;
 public class ThreePaneLayout extends LinearLayout implements View.OnClickListener {
     private static final boolean ANIMATION_DEBUG = false; // DON'T SUBMIT WITH true
 
-    // STOPSHIP Make sure we're using the same parameters as gmail does
     private static final int ANIMATION_DURATION = ANIMATION_DEBUG ? 1000 : 80;
     private static final TimeInterpolator INTERPOLATOR = new DecelerateInterpolator(1.5f);