ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change account settings buttons back to text

Browse Source 
We actually only want the nav arrows on initial
account setup, not in regular settings.

Change-Id: I02e153638e5df29c1fd7aa134db36bde9fc0666e
This commit is contained in:
Martin Hibdon 2014-02-14 13:14:45 -08:00
parent 38fd08e470
commit b9f8dbce19
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
res/layout/account_settings_buttons.xml
View File

@ -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>
style="@style/accountSettingsButton"
android:layout_width="0dip"
android:layout_weight="1"
android:text="@string/done_action" />
</LinearLayout>

2
src/com/android/email/activity/setup/AccountServerBaseFragment.java
View File

@ -66,7 +66,7 @@ public abstract class AccountServerBaseFragment extends Fragment
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;