From 2857b5d0931acb49b66cff9a53b7f610575ffeb2 Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Thu, 6 Mar 2014 10:46:30 -0800
Subject: [PATCH] Fix appearance and a11y of account setup navigation buttons

b/13341957

Change-Id: I3664c83ef6c9016448fa6691bb27146fcb8144b4
---
 .../account_setup_buttons.xml                 |  8 +++--
 res/layout/account_setup_buttons.xml          | 30 +++++++++++--------
 res/values/styles.xml                         |  5 ++++
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/res/layout-sw600dp-land/account_setup_buttons.xml b/res/layout-sw600dp-land/account_setup_buttons.xml
index 4d4034c30..b07ec86eb 100644
--- a/res/layout-sw600dp-land/account_setup_buttons.xml
+++ b/res/layout-sw600dp-land/account_setup_buttons.xml
@@ -14,9 +14,11 @@
      limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
     <ImageButton
+            style="@style/accountSetupNavButton"
+            android:contentDescription="@string/previous_action"
             android:id="@+id/previous"
             android:layout_marginTop="@dimen/setup_buttons_padding_top"
             android:layout_marginRight="@dimen/setup_buttons_padding_right"
@@ -25,6 +27,8 @@
             android:src="@drawable/ic_nav_arrow_back"
             android:text="@string/previous_action"/>
     <ImageButton
+            style="@style/accountSetupNavButton"
+            android:contentDescription="@string/next_action"
             android:id="@+id/next"
             android:layout_below="@+id/previous"
             android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
diff --git a/res/layout/account_setup_buttons.xml b/res/layout/account_setup_buttons.xml
index 1a6a11382..ad8f9bbd0 100644
--- a/res/layout/account_setup_buttons.xml
+++ b/res/layout/account_setup_buttons.xml
@@ -19,17 +19,21 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/setup_buttons_padding_bottom">
     <ImageButton
-        android:id="@+id/previous"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:src="@drawable/ic_nav_arrow_back"
-        android:text="@string/next_action"
-        android:layout_alignParentLeft="true"/>
+            style="@style/accountSetupNavButton"
+            android:contentDescription="@string/previous_action"
+            android:id="@+id/previous"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:src="@drawable/ic_nav_arrow_back"
+            android:text="@string/next_action"
+            android:layout_alignParentLeft="true"/>
     <ImageButton
-        android:id="@+id/next"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:src="@drawable/ic_nav_arrow_forward"
-        android:text="@string/next_action"
-        android:layout_alignParentRight="true"/>
-</RelativeLayout>
\ No newline at end of file
+            style="@style/accountSetupNavButton"
+            android:contentDescription="@string/next_action"
+            android:id="@+id/next"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:src="@drawable/ic_nav_arrow_forward"
+            android:text="@string/next_action"
+            android:layout_alignParentRight="true"/>
+</RelativeLayout>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 546d9a5e8..5402795a4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,6 +32,11 @@
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
     </style>
 
+    <!-- Navigation buttons on the account setup screens -->
+    <style name="accountSetupNavButton">
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+
     <!-- Cancel/Done buttons on the account settings (server settings) fragments -->
     <style name="accountSettingsButton">
         <item name="android:layout_width">160sp</item>