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

Merge branch 'from_android_beta_69' into android_branch

Browse source
This commit is contained in:
Eric House 2013-10-17 06:31:17 -07:00
commit 9fe34e4183
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/AndroidManifest.xml
View file

@ -22,7 +22,7 @@
to come from a domain that you own or have control over. --> to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4" package="org.eehouse.android.xw4"
android:versionCode="61" android:versionCode="62"
android:versionName="@string/app_version" android:versionName="@string/app_version"
> >

3
xwords4/android/XWords4/res/menu/board_menu.xml
View file

@ -23,8 +23,7 @@
<item android:id="@+id/board_menu_tray" <item android:id="@+id/board_menu_tray"
/> />
<item android:id="@+id/board_submenu_game" <item android:title="@string/board_submenu_game">
android:title="@string/board_submenu_game">
<menu> <menu>
<item android:id="@+id/board_menu_game_counts" <item android:id="@+id/board_menu_game_counts"
android:title="@string/board_menu_game_counts" /> android:title="@string/board_menu_game_counts" />

10
xwords4/android/XWords4/res/raw/changes
View file

@ -5,21 +5,19 @@
</style> </style>
</head> </head>
<body> <body>
<b>Crosswords 4.4 beta 69 release</b> <b>Crosswords 4.4 beta 70 release</b>
<p>This release features a major upgrade to how the app communicates <p>Recent releases feature a major upgrade to how the app communicates
with the relay, in essence switching from each game communicating with the relay, in essence switching from each game communicating
individually (and only when open) to the app communicating on behalf individually (and only when open) to the app communicating on behalf
of all games. You should notice only that moves are transmitted of all games. You should notice only that moves are transmitted
more reliably. But this being new code you may also notice bugs. more reliably. But this being new code you may also notice bugs.
If you don't <a href="mailto:xwords@eehouse.org">tell me about If you don't <a href="mailto:xwords@eehouse.org">tell me about
them</a> they will not get fixed. them</a> they will not get fixed. </p>
</p>
<h3>New with this release</h3> <h3>New with this release</h3>
<ul> <ul>
<li>Fix relay registration problem (Thanks DS!)</li> <li>Work around bug in 2.3.x Android (Thanks O!)</li>
<li>Show Turn done/Pass in actionbar where possible</li>
</ul> </ul>
<h3>Next up</h3> <h3>Next up</h3>

2
xwords4/android/XWords4/res/values/app_name.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_version">4.4 beta 69</string> <string name="app_version">4.4 beta 70</string>
</resources> </resources>

2
xwords4/android/XWords4/res/values/strings.xml
View file

@ -652,7 +652,7 @@
<string name="board_menu_undo_last">Undo last</string> <string name="board_menu_undo_last">Undo last</string>
<!-- Title of submenu --> <!-- Title of submenu -->
<string name="board_submenu_game">Game</string> <string name="board_submenu_game">Game -></string>
<!-- menu on Game submenu: brings up dialog listing all tiles in <!-- menu on Game submenu: brings up dialog listing all tiles in
the language of the game along with how many of each there the language of the game along with how many of each there

1
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
View file

@ -740,7 +740,6 @@ public class BoardActivity extends XWActivity
Utils.setItemVisible( menu, R.id.board_menu_undo_last, !inTrade ); Utils.setItemVisible( menu, R.id.board_menu_undo_last, !inTrade );
Utils.setItemVisible( menu, R.id.board_menu_tray, !inTrade ); Utils.setItemVisible( menu, R.id.board_menu_tray, !inTrade );
Utils.setItemVisible( menu, R.id.board_submenu_game, !inTrade );
if ( !inTrade ) { if ( !inTrade ) {
boolean enabled = null == m_gsi || m_gsi.curTurnSelected; boolean enabled = null == m_gsi || m_gsi.curTurnSelected;

6
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java
View file

@ -24,7 +24,9 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Paint; import android.graphics.Paint;
import android.os.Build;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import junit.framework.Assert; import junit.framework.Assert;
import org.eehouse.android.xw4.XWPrefs; import org.eehouse.android.xw4.XWPrefs;
@ -239,7 +241,9 @@ public class CommonPrefs extends XWPrefs {
public static boolean getHideTitleBar( Context context ) public static boolean getHideTitleBar( Context context )
{ {
return getPrefsBoolean( context, R.string.key_hide_title, false ); boolean hideByDefault = 11 > Integer.valueOf( Build.VERSION.SDK );
return getPrefsBoolean( context, R.string.key_hide_title,
hideByDefault );
} }
public static boolean getSoundNotify( Context context ) public static boolean getSoundNotify( Context context )