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
This commit is contained in:
parent
38fd08e470
commit
b9f8dbce19
@ -14,24 +14,23 @@
|
|||||||
limitations under the License.
|
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_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
android:paddingTop="@dimen/settings_buttons_padding_top"
|
android:paddingTop="@dimen/settings_buttons_padding_top"
|
||||||
android:paddingBottom="@dimen/settings_buttons_padding_bottom"
|
android:paddingBottom="@dimen/settings_buttons_padding_bottom">
|
||||||
>
|
|
||||||
<ImageButton
|
<Button
|
||||||
android:id="@+id/cancel"
|
android:id="@+id/cancel"
|
||||||
android:layout_height="wrap_content"
|
style="@style/accountSettingsButton"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="0dip"
|
||||||
android:src="@drawable/ic_nav_arrow_back"
|
android:layout_weight="1"
|
||||||
android:text="@string/cancel_action"
|
android:text="@string/cancel_action" />
|
||||||
android:layout_alignParentLeft="true"/>
|
<Button
|
||||||
<ImageButton
|
|
||||||
android:id="@+id/done"
|
android:id="@+id/done"
|
||||||
android:layout_height="wrap_content"
|
style="@style/accountSettingsButton"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="0dip"
|
||||||
android:src="@drawable/ic_nav_arrow_forward"
|
android:layout_weight="1"
|
||||||
android:text="@string/done_action"
|
android:text="@string/done_action" />
|
||||||
android:layout_alignParentRight="true"/>
|
</LinearLayout>
|
||||||
</RelativeLayout>
|
|
@ -66,7 +66,7 @@ public abstract class AccountServerBaseFragment extends Fragment
|
|||||||
protected SetupDataFragment mSetupData;
|
protected SetupDataFragment mSetupData;
|
||||||
|
|
||||||
// This is null in the setup wizard screens, and non-null in AccountSettings mode
|
// 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)
|
// This is used to debounce multiple clicks on the proceed button (which does async work)
|
||||||
private boolean mProceedButtonPressed;
|
private boolean mProceedButtonPressed;
|
||||||
|
Loading…
Reference in New Issue
Block a user