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

Fix temporary setup flow on tablets

Browse Source 
b/13105763

Change-Id: I63f6956afbbaceadfc1a77701c6f256705601c09
This commit is contained in:
Martin Hibdon 2014-02-20 14:32:22 -08:00
parent 56b7ef3c0d
commit ae0143e489
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
res/layout-sw600dp-land/account_setup_basics.xml
View File

@ -46,29 +46,25 @@
android:background="@color/account_setup_divider_color" /> android:background="@color/account_setup_divider_color" />
<!-- Buttons on the right --> <!-- Buttons on the right -->
<Button <TextView
android:id="@+id/manual_setup" android:id="@+id/manual_setup"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_below="@+id/top_divider" android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginTop="@dimen/setup_buttons_padding_top" android:layout_marginTop="@dimen/setup_buttons_padding_top"
android:layout_marginRight="@dimen/setup_buttons_padding_right" android:layout_marginRight="@dimen/setup_buttons_padding_right"
style="@style/accountSetupButton" android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/account_setup_basics_manual_setup_action" /> android:text="@string/account_setup_basics_manual_setup_action" />
<Button <ImageButton
android:id="@+id/oauth_setup" android:id="@+id/next"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_below="@+id/manual_setup" android:layout_below="@+id/manual_setup"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginTop="@dimen/setup_buttons_vertical_spacing" android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
android:layout_marginRight="@dimen/setup_buttons_padding_right" android:layout_marginRight="@dimen/setup_buttons_padding_right"
style="@style/accountSetupButton" android:src="@drawable/ic_nav_arrow_forward"
android:text="@string/account_setup_basics_oauth_setup_action" />
<Button
android:id="@+id/next"
android:layout_below="@+id/oauth_setup"
android:layout_alignParentRight="true"
android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
android:layout_marginRight="@dimen/setup_buttons_padding_right"
style="@style/accountSetupButton"
android:text="@string/next_action" /> android:text="@string/next_action" />
<!-- Frame on the left containing the (common) setup info --> <!-- Frame on the left containing the (common) setup info -->

18
res/layout-sw600dp-port/account_setup_basics.xml
View File

@ -78,26 +78,22 @@
android:layout_marginBottom="@dimen/setup_buttons_padding_bottom" android:layout_marginBottom="@dimen/setup_buttons_padding_bottom"
> >
<!-- Buttons below --> <!-- Buttons below -->
<Button <TextView
android:id="@+id/manual_setup" android:id="@+id/manual_setup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginLeft="@dimen/setup_buttons_padding_left" android:layout_marginLeft="@dimen/setup_buttons_padding_left"
style="@style/accountSetupButton"
android:text="@string/account_setup_basics_manual_setup_action" /> android:text="@string/account_setup_basics_manual_setup_action" />
<Button <ImageButton
android:id="@+id/oauth_setup"
android:layout_below="@+id/manual_setup"
android:layout_alignParentLeft="true"
android:layout_marginLeft="@dimen/setup_buttons_padding_left"
style="@style/accountSetupButton"
android:text="@string/account_setup_basics_oauth_setup_action" />
<Button
android:id="@+id/next" android:id="@+id/next"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/setup_buttons_padding_right" android:layout_marginRight="@dimen/setup_buttons_padding_right"
style="@style/accountSetupButton" android:src="@drawable/ic_nav_arrow_forward"
android:text="@string/next_action" /> android:text="@string/next_action" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>