Change account settings buttons back to text
We actually only want the nav arrows on initial
account setup, not in regular settings.
Change-Id: I02e153638e5df29c1fd7aa134db36bde9fc0666e
diff --git a/res/layout/account_settings_buttons.xml b/res/layout/account_settings_buttons.xml
index 68cc5dc..8616fda 100644
--- a/res/layout/account_settings_buttons.xml
+++ b/res/layout/account_settings_buttons.xml
@@ -14,24 +14,23 @@
limitations under the License.
-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:orientation="horizontal"
android:paddingTop="@dimen/settings_buttons_padding_top"
- android:paddingBottom="@dimen/settings_buttons_padding_bottom"
- >
- <ImageButton
+ android:paddingBottom="@dimen/settings_buttons_padding_bottom">
+
+ <Button
android:id="@+id/cancel"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:src="@drawable/ic_nav_arrow_back"
- android:text="@string/cancel_action"
- android:layout_alignParentLeft="true"/>
- <ImageButton
+ style="@style/accountSettingsButton"
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ android:text="@string/cancel_action" />
+ <Button
android:id="@+id/done"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:src="@drawable/ic_nav_arrow_forward"
- android:text="@string/done_action"
- android:layout_alignParentRight="true"/>
-</RelativeLayout>
\ No newline at end of file
+ style="@style/accountSettingsButton"
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ android:text="@string/done_action" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/com/android/email/activity/setup/AccountServerBaseFragment.java b/src/com/android/email/activity/setup/AccountServerBaseFragment.java
index 96c425f..3c136b1 100644
--- a/src/com/android/email/activity/setup/AccountServerBaseFragment.java
+++ b/src/com/android/email/activity/setup/AccountServerBaseFragment.java
@@ -66,7 +66,7 @@
protected SetupDataFragment mSetupData;
// This is null in the setup wizard screens, and non-null in AccountSettings mode
- private ImageButton mProceedButton;
+ private View mProceedButton;
// This is used to debounce multiple clicks on the proceed button (which does async work)
private boolean mProceedButtonPressed;
