From 4fb4820223b2b98b2a8517c9231950c0740cb15c Mon Sep 17 00:00:00 2001
From: Milos Stankovic <miloss@google.com>
Date: Fri, 11 Jul 2014 12:02:08 +0200
Subject: [PATCH] Moving Previous, Next and Done strings to UnifiedEmail.

Other change: 500164
Change-Id: I2eb4fd00b62d18c523c3ec49eec6748eb602e7cd
---
 res/layout/account_settings_buttons.xml | 2 +-
 res/layout/account_setup_template.xml   | 8 ++++----
 res/values/strings.xml                  | 6 ------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/res/layout/account_settings_buttons.xml b/res/layout/account_settings_buttons.xml
index 5f510944c..81e9522a4 100644
--- a/res/layout/account_settings_buttons.xml
+++ b/res/layout/account_settings_buttons.xml
@@ -32,5 +32,5 @@
         style="@style/account_settings_button"
         android:layout_width="0dip"
         android:layout_weight="1"
-        android:text="@string/done_action" />
+        android:text="@string/done" />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/account_setup_template.xml b/res/layout/account_setup_template.xml
index 540356d72..fc44c88dc 100644
--- a/res/layout/account_setup_template.xml
+++ b/res/layout/account_setup_template.xml
@@ -57,12 +57,12 @@
             android:orientation="horizontal">
             <ImageButton
                 style="@style/account_setup_nav_button"
-                android:contentDescription="@string/previous_action"
+                android:contentDescription="@string/previous"
                 android:id="@+id/previous"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:src="@drawable/ic_nav_arrow_previous_button"
-                android:text="@string/next_action" />
+                android:text="@string/next" />
             <Button
                 android:id="@+id/manual_setup"
                 android:layout_height="wrap_content"
@@ -77,12 +77,12 @@
                 android:layout_weight="1" />
             <ImageButton
                 style="@style/account_setup_nav_button"
-                android:contentDescription="@string/next_action"
+                android:contentDescription="@string/next"
                 android:id="@+id/next"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:src="@drawable/ic_nav_arrow_next_button"
-                android:text="@string/next_action" />
+                android:text="@string/next" />
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0c7709861..9ed270455 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -40,12 +40,6 @@
     <!-- Actions will be used as buttons and in menu items -->
     <skip />
 
-    <!-- Button name used as part of a multi-step process -->
-    <string name="next_action">Next</string>
-    <!-- Button name used to cancel out of dialog boxes -->
-    <string name="previous_action">Previous</string>
-    <!--  Button name used to complete a multi-step process -->
-    <string name="done_action">Done</string>
     <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
     <string name="create_action">Create new</string>
     <!-- Message informing user when a list that would contain quick responses