Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'android_branch' into android_translate

Browse source 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Eric House 2015-08-03 04:45:48 -07:00
commit 2b286fd7ac
8 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4-dbg/build.xml
View file

@ -54,6 +54,8 @@
<property name="INITIAL_CLIENT_VERS" value="4"/>
<property name="VARIANT_NAME" value="xw4dbg"/>
<property name="APP_NAME" value="CrossDbg"/>
<target name="-pre-clean">
<antcall target="my-pre-clean" />
</target>

4
xwords4/android/XWords4/jni/andutils.c
View file

@ -659,10 +659,10 @@ void deleteLocalRef( JNIEnv* env, jobject jobj )
}
void
deleteLocalRefs( JNIEnv* env, jobject jobj, ... )
deleteLocalRefs( JNIEnv* env, ... )
{
va_list ap;
va_start( ap, jobj );
va_start( ap, env );
for ( ; ; ) {
jobject jnext = va_arg( ap, jobject );
if ( DELETE_NO_REF == jnext ) {

2
xwords4/android/XWords4/jni/andutils.h
View file

@ -97,6 +97,6 @@ jint jEnumToInt( JNIEnv* env, jobject jenum );
XP_U32 getCurSeconds( JNIEnv* env );
void deleteLocalRef( JNIEnv* env, jobject jobj );
void deleteLocalRefs( JNIEnv* env, jobject jobj, ... );
void deleteLocalRefs( JNIEnv* env, ... );
# define DELETE_NO_REF ((jobject)-1) /* terminates above varargs list */
#endif

5
xwords4/android/XWords4/res/menu-small/board_menu.xml
View file

@ -93,11 +93,6 @@
android:title="@string/menu_prefs"
android:alphabeticShortcut="P"
/>
<item android:id="@+id/board_menu_file_about"
android:title="@string/board_menu_file_about"
android:alphabeticShortcut="A"
/>
<item android:id="@+id/board_menu_game_netstats"
android:title="@string/board_menu_game_netstats" />

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

@ -65,10 +65,6 @@
android:title="@string/menu_prefs"
android:alphabeticShortcut="P"
/>
<item android:id="@+id/board_menu_file_about"
android:title="@string/board_menu_file_about"
android:alphabeticShortcut="A"
/>
<item android:id="@+id/board_menu_game_netstats"
android:title="@string/board_menu_game_netstats" />

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
View file

@ -23,6 +23,7 @@ package org.eehouse.android.xw4;
import android.app.Activity;
import android.app.Service;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothClass.Device.Major;
import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothServerSocket;
@ -974,10 +975,13 @@ public class BTService extends XWService {
Set<BluetoothDevice> pairedDevs = m_adapter.getBondedDevices();
synchronized( m_addrs ) {
for ( BluetoothDevice dev : pairedDevs ) {
int clazz = dev.getBluetoothClass().getMajorDeviceClass();
if ( Major.PHONE == clazz || Major.COMPUTER == clazz ) {
m_addrs.add( dev.getAddress() );
}
}
}
}
private void sendNames()
{

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
View file

@ -920,10 +920,6 @@ public class BoardDelegate extends DelegateBase
Utils.launchSettings( m_activity );
break;
case R.id.board_menu_file_about:
showAboutDialog();
break;
default:
DbgUtils.logf( "menuitem %d not handled", id );
handled = false;

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
View file

@ -524,6 +524,9 @@ public class DelegateBase implements DlgClickNotify,
case APP_NOT_FOUND:
fmtId = R.string.app_not_found_fmt;
break;
case RELAY_ALERT:
m_dlgDelegate.eventOccurred( event, args );
break;
default:
if ( BuildConfig.DEBUG ) {
DbgUtils.logf( "DelegateBase.eventOccurred(event=%s) (DROPPED)",