Merge "[Quantum tip teasers]" into ub-gmail-ur14-dev

37 files changed, 94 insertions, 262 deletions

diff --git a/res/drawable-hdpi/ic_arrow.png b/res/drawable-hdpi/ic_arrow.png
deleted file mode 100644
index 8d0dfcd47..000000000
--- a/res/drawable-hdpi/ic_arrow.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_cancel_red_24dp.png b/res/drawable-hdpi/ic_cancel_red_24dp.png
new file mode 100644
index 000000000..615efd358
--- /dev/null
+++ b/res/drawable-hdpi/ic_cancel_red_24dp.png
diff --git a/res/drawable-hdpi/ic_check_red_24dp.png b/res/drawable-hdpi/ic_check_red_24dp.png
new file mode 100644
index 000000000..87b0c2035
--- /dev/null
+++ b/res/drawable-hdpi/ic_check_red_24dp.png
diff --git a/res/drawable-hdpi/list_read_holo.9.png b/res/drawable-hdpi/list_read_holo.9.png
deleted file mode 100644
index 47e3a8b2d..000000000
--- a/res/drawable-hdpi/list_read_holo.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/list_unread_holo.9.png b/res/drawable-hdpi/list_unread_holo.9.png
deleted file mode 100644
index 47e3a8b2d..000000000
--- a/res/drawable-hdpi/list_unread_holo.9.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-hdpi/ic_arrow.png b/res/drawable-ldrtl-hdpi/ic_arrow.png
deleted file mode 100644
index 6cbd0aa3c..000000000
--- a/res/drawable-ldrtl-hdpi/ic_arrow.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-mdpi/ic_arrow.png b/res/drawable-ldrtl-mdpi/ic_arrow.png
deleted file mode 100644
index 0b5d17574..000000000
--- a/res/drawable-ldrtl-mdpi/ic_arrow.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xhdpi/ic_arrow.png b/res/drawable-ldrtl-xhdpi/ic_arrow.png
deleted file mode 100644
index 5697eacac..000000000
--- a/res/drawable-ldrtl-xhdpi/ic_arrow.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xxhdpi/ic_arrow.png b/res/drawable-ldrtl-xxhdpi/ic_arrow.png
deleted file mode 100644
index 491f54813..000000000
--- a/res/drawable-ldrtl-xxhdpi/ic_arrow.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_arrow.png b/res/drawable-mdpi/ic_arrow.png
deleted file mode 100644
index 96440a2be..000000000
--- a/res/drawable-mdpi/ic_arrow.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_cancel_red_24dp.png b/res/drawable-mdpi/ic_cancel_red_24dp.png
new file mode 100644
index 000000000..d2d6cbc2d
--- /dev/null
+++ b/res/drawable-mdpi/ic_cancel_red_24dp.png
diff --git a/res/drawable-mdpi/ic_check_red_24dp.png b/res/drawable-mdpi/ic_check_red_24dp.png
new file mode 100644
index 000000000..a67591023
--- /dev/null
+++ b/res/drawable-mdpi/ic_check_red_24dp.png
diff --git a/res/drawable-mdpi/list_read_holo.9.png b/res/drawable-mdpi/list_read_holo.9.png
deleted file mode 100644
index 5865b73ab..000000000
--- a/res/drawable-mdpi/list_read_holo.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/list_unread_holo.9.png b/res/drawable-mdpi/list_unread_holo.9.png
deleted file mode 100644
index 5865b73ab..000000000
--- a/res/drawable-mdpi/list_unread_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_arrow.png b/res/drawable-xhdpi/ic_arrow.png
deleted file mode 100644
index 889c33fce..000000000
--- a/res/drawable-xhdpi/ic_arrow.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_cancel_red_24dp.png b/res/drawable-xhdpi/ic_cancel_red_24dp.png
new file mode 100644
index 000000000..30a76c871
--- /dev/null
+++ b/res/drawable-xhdpi/ic_cancel_red_24dp.png
diff --git a/res/drawable-xhdpi/ic_check_red_24dp.png b/res/drawable-xhdpi/ic_check_red_24dp.png
new file mode 100644
index 000000000..0fb8a18ff
--- /dev/null
+++ b/res/drawable-xhdpi/ic_check_red_24dp.png
diff --git a/res/drawable-xhdpi/list_read_holo.9.png b/res/drawable-xhdpi/list_read_holo.9.png
deleted file mode 100644
index ff8cd6d17..000000000
--- a/res/drawable-xhdpi/list_read_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/list_unread_holo.9.png b/res/drawable-xhdpi/list_unread_holo.9.png
deleted file mode 100644
index ff8cd6d17..000000000
--- a/res/drawable-xhdpi/list_unread_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_arrow.png b/res/drawable-xxhdpi/ic_arrow.png
deleted file mode 100644
index f8e7731d4..000000000
--- a/res/drawable-xxhdpi/ic_arrow.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_cancel_red_24dp.png b/res/drawable-xxhdpi/ic_cancel_red_24dp.png
new file mode 100644
index 000000000..73fe1e3d5
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_cancel_red_24dp.png
diff --git a/res/drawable-xxhdpi/ic_check_red_24dp.png b/res/drawable-xxhdpi/ic_check_red_24dp.png
new file mode 100644
index 000000000..0dccc8f63
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_check_red_24dp.png
diff --git a/res/drawable-xxhdpi/list_read_holo.9.png b/res/drawable-xxhdpi/list_read_holo.9.png
deleted file mode 100644
index 20cfb22a3..000000000
--- a/res/drawable-xxhdpi/list_read_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/list_unread_holo.9.png b/res/drawable-xxhdpi/list_unread_holo.9.png
deleted file mode 100644
index 20cfb22a3..000000000
--- a/res/drawable-xxhdpi/list_unread_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_cancel_red_24dp.png b/res/drawable-xxxhdpi/ic_cancel_red_24dp.png
new file mode 100644
index 000000000..0982acd9c
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_cancel_red_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_check_red_24dp.png b/res/drawable-xxxhdpi/ic_check_red_24dp.png
new file mode 100644
index 000000000..5f86751cf
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_check_red_24dp.png
diff --git a/res/drawable/conversation_photo_teaser_checkmark_bg.xml b/res/drawable/conversation_photo_teaser_checkmark_bg.xml
new file mode 100644
index 000000000..484a3affa
--- /dev/null
+++ b/res/drawable/conversation_photo_teaser_checkmark_bg.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 Google Inc.
+     Licensed to The Android Open Source Project.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@android:color/white" />
+</shape>
\ No newline at end of file
diff --git a/res/layout/conversation_long_press_to_select_tip_view.xml b/res/layout/conversation_long_press_to_select_tip_view.xml
deleted file mode 100644
index dc0f3d077..000000000
--- a/res/layout/conversation_long_press_to_select_tip_view.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013 Google Inc. -->
-<com.android.mail.ui.ConversationLongPressTipView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/swiped_bg_color" >
-
-    <LinearLayout
-        android:id="@+id/swipeable_content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/conversation_item_background_selector"
-        android:orientation="horizontal" >
-
-        <TextView
-            android:id="@+id/text"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginBottom="12dp"
-            android:layout_marginTop="12dp"
-            android:layout_weight="1"
-            android:duplicateParentState="true"
-            android:fontFamily="sans-serif-light"
-            android:text="@string/long_press_to_select_tip"
-            android:textColor="@color/teaser_main_text"
-            android:textSize="16sp"
-            style="@style/TeaserTextStyle" />
-
-        <View
-            android:id="@+id/dismiss_separator"
-            android:layout_width="1dip"
-            android:layout_height="match_parent"
-            android:background="@color/teaser_main_text"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
-            style="@style/DismissSeparatorStyle" />
-
-        <ImageButton
-            android:id="@+id/dismiss_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?android:attr/selectableItemBackground"
-            android:clickable="true"
-            android:scaleType="center"
-            android:contentDescription="@string/dismiss_tip_hover_text"
-            android:src="@drawable/ic_cancel_holo_light"
-            style="@style/DismissButtonStyle" />
-
-    </LinearLayout>
-
-</com.android.mail.ui.ConversationLongPressTipView>
diff --git a/res/layout/conversation_outbox_tip_view.xml b/res/layout/conversation_outbox_tip_view.xml
deleted file mode 100644
index e10f9232f..000000000
--- a/res/layout/conversation_outbox_tip_view.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013 Google Inc. -->
-<com.android.mail.ui.ConversationsInOutboxTipView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/swiped_bg_color" >
-
-    <LinearLayout
-        android:id="@+id/swipeable_content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/conversation_item_background_selector"
-        android:orientation="horizontal" >
-
-        <TextView
-            android:id="@+id/outbox"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginBottom="12dp"
-            android:layout_marginTop="12dp"
-            android:layout_weight="1"
-            android:duplicateParentState="true"
-            android:fontFamily="sans-serif-light"
-            android:textColor="@color/teaser_main_text"
-            android:textSize="16sp"
-            style="@style/TeaserTextStyle" />
-
-        <View
-            android:id="@+id/dismiss_separator"
-            android:layout_width="1dip"
-            android:layout_height="match_parent"
-            android:background="@color/teaser_main_text"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
-            style="@style/DismissSeparatorStyle" />
-
-        <ImageButton
-            android:id="@+id/dismiss_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?android:attr/selectableItemBackground"
-            android:clickable="true"
-            android:scaleType="center"
-            android:contentDescription="@string/dismiss_tip_hover_text"
-            android:src="@drawable/ic_cancel_holo_light"
-            style="@style/DismissButtonStyle" />
-
-    </LinearLayout>
-
-</com.android.mail.ui.ConversationsInOutboxTipView>
diff --git a/res/layout/conversation_photo_teaser_view.xml b/res/layout/conversation_photo_teaser_view.xml
deleted file mode 100644
index f66c16976..000000000
--- a/res/layout/conversation_photo_teaser_view.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013 Google Inc. -->
-<com.android.mail.ui.ConversationPhotoTeaserView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/swiped_bg_color" >
-
-    <LinearLayout
-        android:id="@+id/swipeable_content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/conversation_item_background_selector"
-        android:orientation="horizontal" >
-
-        <ImageView
-            android:id="@+id/arrow"
-            android:layout_width="48dp"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="12dp"
-            android:duplicateParentState="true"
-            android:src="@drawable/ic_arrow"
-            android:visibility="invisible"
-            style="@style/ArrowStyle" />
-
-        <TextView
-            android:id="@+id/text"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginBottom="12dp"
-            android:layout_marginTop="12dp"
-            android:layout_weight="1"
-            android:duplicateParentState="true"
-            android:fontFamily="sans-serif-light"
-            android:text="@string/conversation_photo_welcome_text"
-            android:textColor="@color/teaser_main_text"
-            android:textSize="16sp" />
-
-        <View
-            android:id="@+id/dismiss_separator"
-            android:layout_width="1dip"
-            android:layout_height="match_parent"
-            android:background="@color/teaser_main_text"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
-            style="@style/DismissSeparatorStyle"/>
-
-        <ImageButton
-            android:id="@+id/dismiss_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?android:attr/selectableItemBackground"
-            android:clickable="true"
-            android:scaleType="center"
-            android:contentDescription="@string/dismiss_tip_hover_text"
-            android:src="@drawable/ic_cancel_holo_light"
-            style="@style/DismissButtonStyle" />
-
-    </LinearLayout>
-
-</com.android.mail.ui.ConversationPhotoTeaserView>
diff --git a/res/layout/conversation_sync_disabled_tip_view.xml b/res/layout/conversation_sync_disabled_tip_view.xml
deleted file mode 100644
index 8d96d70ce..000000000
--- a/res/layout/conversation_sync_disabled_tip_view.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013 Google Inc. -->
-<com.android.mail.ui.ConversationSyncDisabledTipView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/swiped_bg_color" >
-
-    <LinearLayout
-        android:id="@+id/swipeable_content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/conversation_item_background_selector"
-        android:orientation="horizontal" >
-
-        <LinearLayout
-            android:id="@+id/text_area"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="16dp" >
-
-            <TextView
-                android:id="@+id/text_line1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:duplicateParentState="true"
-                android:fontFamily="sans-serif-light"
-                android:textColor="@color/teaser_main_text"
-                android:textSize="16sp" />
-
-            <TextView
-                android:id="@+id/text_line2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:duplicateParentState="true"
-                android:fontFamily="sans-serif-light"
-                android:textColor="@color/teaser_main_text"
-                android:textSize="16sp" />
-
-        </LinearLayout>
-
-        <View
-            android:id="@+id/dismiss_separator"
-            android:layout_width="1dip"
-            android:layout_height="match_parent"
-            android:background="@color/teaser_main_text"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
-            style="@style/DismissSeparatorStyle" />
-
-        <ImageButton
-            android:id="@+id/dismiss_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?android:attr/selectableItemBackground"
-            android:clickable="true"
-            android:scaleType="center"
-            android:contentDescription="@string/dismiss_tip_hover_text"
-            android:src="@drawable/ic_cancel_holo_light"
-            style="@style/DismissButtonStyle" />
-
-    </LinearLayout>
-
-</com.android.mail.ui.ConversationSyncDisabledTipView>
diff --git a/res/layout/conversation_tip_view.xml b/res/layout/conversation_tip_view.xml
new file mode 100644
index 000000000..9e9286f63
--- /dev/null
+++ b/res/layout/conversation_tip_view.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2014 Google Inc.
+    Licensed to The Android Open Source Project.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/conversation_tip_swipeable_content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/tip_teaser_bg">
+
+    <ImageView
+        android:id="@+id/conversation_tip_icon1"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical"
+        android:scaleType="center"
+        style="@style/TeaserStartMargin" />
+
+    <TextView
+        android:id="@+id/conversation_tip_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:maxLines="2"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:textColor="@color/tip_teaser_red_text"
+        android:textSize="16sp"
+        style="@style/TeaserStartMargin" />
+
+    <ImageView
+        android:id="@+id/dismiss_icon"
+        android:layout_width="56dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical"
+        android:contentDescription="@string/dismiss_tip_hover_text"
+        android:background="?android:attr/selectableItemBackground"
+        android:scaleType="center"
+        android:src="@drawable/ic_cancel_red_24dp" />
+
+</LinearLayout>
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index 8ad25ceb1..a963ab5e3 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -17,11 +17,6 @@
 -->
 
 <resources>
-    <style name="DismissButtonStyle">
-        <item name="android:paddingStart">@dimen/dismiss_button_padding_start</item>
-        <item name="android:paddingEnd">@dimen/dismiss_button_padding_end</item>
-    </style>
-
     <style name="MessageDetailsHeaderStyle">
         <item name="android:paddingStart">@dimen/message_details_header_padding_start_expanded</item>
         <item name="android:paddingEnd">@dimen/message_details_header_padding_end</item>
@@ -85,7 +80,7 @@
         <item name="android:layout_marginStart">@dimen/dismiss_separator_padding</item>
     </style>
 
-    <style name="TeaserTextStyle">
+    <style name="TeaserStartMargin">
         <item name="android:layout_marginStart">@dimen/teaser_text_padding</item>
     </style>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 839e76229..2095655f5 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -132,6 +132,11 @@
     <!-- The color of the section name text in the teaser -->
     <color name="teaser_main_text">@color/dark_gray_text_color</color>
 
+    <!-- tip teaser colors -->
+    <color name="tip_teaser_bg">#e5e5e5</color>
+    <color name="tip_teaser_link">@color/text_color_blue</color>
+    <color name="tip_teaser_red_text">#da4336</color>
+
     <!-- swipe to refresh text color, this matches the color in
         progressbar_solid_holo.png -->
     <color name="swipe_to_refresh_text_color">#0099cc</color>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index fd4c88652..6b9b87ca7 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -117,13 +117,11 @@
     <dimen name="tile_letter_font_size">24dp</dimen>
     <dimen name="tile_letter_font_size_small">16dp</dimen>
     <dimen name="tile_divider_width">1dp</dimen>
-    <dimen name="dismiss_button_padding_start">20dip</dimen>
-    <dimen name="dismiss_button_padding_end">28dip</dimen>
     <dimen name="checked_text_padding">16dip</dimen>
     <dimen name="send_mail_as_padding">8dip</dimen>
     <dimen name="undo_text_padding">16dip</dimen>
     <dimen name="dismiss_separator_padding">16dip</dimen>
-    <dimen name="teaser_text_padding">16dip</dimen>
+    <dimen name="teaser_text_padding">16dp</dimen>
     <dimen name="attachment_padding_start">16dp</dimen>
     <dimen name="attachment_padding_end">16dp</dimen>
     <dimen name="attachment_icon_padding">5dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f0ce86f04..0f8baecb7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -876,25 +876,18 @@
     <!-- Tip for letting user know that their device auto-sync setting
         is turned off, in case they are wondering why they are not
         receiving any new mail. [CHAR LIMIT=250] -->
-    <string name="auto_sync_off">Auto-sync is off.</string>
-
-    <!-- Tap to turn on device auto-sync setting.  [CHAR LIMIT=250] -->
-    <string name="tap_to_enable_sync">Touch to turn on.</string>
+    <string name="auto_sync_off">Auto-sync is off. Touch to turn on.</string>
 
     <!-- Tip for letting user know that their account level sync setting
         is turned off, in case they are wondering why they are not
-        receiving any new mail. [CHAR LIMIT=250] -->
-    <string name="account_sync_off">Account sync is off.</string>
-
-    <!-- Hint text for user to enable sync in Gmail's account settings.
-         The whole string should read "Turn on in Account settings.", but because we need
-         "Account settings" to appear as blue link text, it's a parameter here.
-         [CHAR LIMIT=250] -->
-    <string name="enable_sync_in_account_settings">Turn on in <xliff:g id="account_settings">%1$s</xliff:g>.</string>
+        receiving any new mail. Then prompts the user to enable sync in Gmail's
+        account settings. Since "Account settings" will appear in blue link text,
+        it's a parameter here [CHAR LIMIT=250] -->
+    <string name="account_sync_off">Account sync is off. Turn on in <xliff:g id="account_settings">%1$s</xliff:g>.</string>
 
     <!-- This is used as a parameter to another string and combined reads
          "Turn on in Account settings." [CHAR LIMIT=250] -->
-    <string name="account_settings_param">Account settings</string>
+    <string name="account_settings_param">Account\u00A0settings</string>
 
     <!-- Hint text that there are X number of unsent messages users
     Outbox. [CHAR LIMIT=250] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ae3a89714..379f33e9a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -543,7 +543,7 @@
     <style name="FailedTextAppearance" parent="@style/DraftTextAppearance"></style>
 
     <style name="LinksInTipTextAppearance">
-        <item name="android:textColor">?android:attr/textColorLink</item>
+        <item name="android:textColor">@color/tip_teaser_link</item>
     </style>
 
     <style name="AbstractNewMessageButtonStyleBase" parent="@android:style/Widget.Holo.Light.Button" />
@@ -561,11 +561,6 @@
         <item name="android:layout_marginRight">@dimen/toast_bar_margin</item>
     </style>
 
-    <style name="DismissButtonStyle">
-        <item name="android:paddingLeft">@dimen/dismiss_button_padding_start</item>
-        <item name="android:paddingRight">@dimen/dismiss_button_padding_end</item>
-    </style>
-
     <style name="MessageDetailsHeaderStyle">
         <item name="android:paddingLeft">@dimen/message_details_header_padding_start_expanded</item>
         <item name="android:paddingRight">@dimen/message_details_header_padding_end</item>
@@ -654,7 +649,7 @@
         <item name="android:layout_marginLeft">@dimen/dismiss_separator_padding</item>
     </style>
 
-    <style name="TeaserTextStyle">
+    <style name="TeaserStartMargin">
         <item name="android:layout_marginLeft">@dimen/teaser_text_padding</item>
     </style>