Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-20 22:26:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote branch 'origin/android_branch' into android_branch

Browse source
This commit is contained in:
Eric House 2012-10-27 08:55:19 -07:00
commit 86378e4f0b
1 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
xwords4/android/XWords4/res/layout/new_game.xml
View file

@ -64,6 +64,49 @@
/> />
</LinearLayout> </LinearLayout>
<!-- networked game -->
<TextView style="@style/config_separator"
android:layout_marginTop="10dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/newgame_networked_header"
/>
<LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
android:layout_marginBottom="10dip"
>
<ImageView android:src="@drawable/relaygame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:layout_gravity="center_vertical|center_horizontal"
/>
<TextView android:text="@string/newgame_networked_desc"
style="@style/relay_explain"
/>
</LinearLayout>
<LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
>
<Button android:id="@+id/newgame_invite"
android:layout_width="fill_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/newgame_invite"
/>
<Button android:id="@+id/newgame_net_config"
android:layout_width="fill_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/newgame_net_config"
/>
</LinearLayout>
<!-- SMS game --> <!-- SMS game -->
<TextView android:id="@+id/sms_separator" <TextView android:id="@+id/sms_separator"
style="@style/config_separator" style="@style/config_separator"
@ -132,49 +175,6 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- networked game -->
<TextView style="@style/config_separator"
android:layout_marginTop="10dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/newgame_networked_header"
/>
<LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
android:layout_marginBottom="10dip"
>
<ImageView android:src="@drawable/relaygame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:layout_gravity="center_vertical|center_horizontal"
/>
<TextView android:text="@string/newgame_networked_desc"
style="@style/relay_explain"
/>
</LinearLayout>
<LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
>
<Button android:id="@+id/newgame_invite"
android:layout_width="fill_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/newgame_invite"
/>
<Button android:id="@+id/newgame_net_config"
android:layout_width="fill_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/newgame_net_config"
/>
</LinearLayout>
<!-- Bluetooth --> <!-- Bluetooth -->
<TextView android:id="@+id/bt_separator" <TextView android:id="@+id/bt_separator"
style="@style/config_separator" style="@style/config_separator"