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

Merge branch 'android_branch' into android_bt

Browse source
This commit is contained in:
Eric House 2012-03-06 07:47:05 -08:00
commit a2493ffa97
9 changed files with 18 additions and 54 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. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4"
android:versionCode="34"
android:versionCode="35"
android:versionName="@string/app_version"
>

2
xwords4/android/XWords4/res/layout/lookup.xml
View file

@ -7,7 +7,7 @@
android:layout_height="fill_parent"
>
<ListView android:id="@+id/list"
<ListView android:id="@+id/lookup_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:drawSelectorOnTop="false"

40
xwords4/android/XWords4/res/layout/select_dialog_item.xml
View file

@ -1,40 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/res/layout/select_dialog_item.xml
**
** Copyright 2006, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!--
This layout file is used by the AlertDialog when displaying a list of items.
This layout file is inflated and used as the TextView to display individual
items.
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center_vertical"
android:paddingLeft="14dip"
android:paddingRight="15dip"
android:ellipsize="marquee"
android:textColor="#FFFFFFFF"
/>
<!-- this guy's private -->
<!-- android:textColor="@android:color/bright_foreground_light" -->

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

@ -5,11 +5,11 @@
</style>
</head>
<body>
<b>Crosswords 4.4 beta 42 release</b>
<b>Crosswords 4.4 beta 43 release</b>
<ul>
<li>Fix nasty Ice Cream Sandwich crash -- my bad</li>
<li>Improve network game startup</li>
<li>Include room name in invitation email subject</li>
<li>Fix new crash drawing board on some versions of Android </li>
<li>in Wordlist screen remember which languages are expanded</li>
</ul>
<p>Please remember that this is beta software. Please let me know (at

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

@ -3,7 +3,7 @@
<!-- Resources in this file do not require localization -->
<resources>
<string name="app_version">4.4 beta 42</string>
<string name="app_version">4.4 beta 43</string>
<!-- prefs keys -->
<string name="key_color_tiles">key_color_tiles</string>

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

@ -56,8 +56,8 @@ public class LookupView extends LinearLayout
private static String[] s_lookupUrls;
private static ArrayAdapter<String> s_urlsAdapter;
private static final int LIST_LAYOUT = // android.R.layout.simple_list_item_1;
// android.R.layout.select_dialog_item;
R.layout.select_dialog_item;
android.R.layout.select_dialog_item;
//R.layout.select_dialog_item;
private static int s_lang = -1;
@ -90,7 +90,7 @@ public class LookupView extends LinearLayout
m_wordsAdapter = new ArrayAdapter<String>( m_context, LIST_LAYOUT,
m_words );
m_list = (ListView)findViewById( R.id.list );
m_list = (ListView)findViewById( R.id.lookup_list );
m_list.setOnItemClickListener( this );
m_doneButton = (Button)findViewById( R.id.button_done );

1
xwords4/android/scripts/arelease.sh
View file

@ -71,6 +71,7 @@ for PACK_UNSIGNED in $FILES; do
zipalign -v 4 $PACK_UNSIGNED $PACK_SIGNED
[ -n "$XW_WWW_PATH" ] && cp $PACK_SIGNED $XW_WWW_PATH
cp $PACK_SIGNED ${PACK_SIGNED%.apk}_$(git describe).apk
echo "created ${PACK_SIGNED%.apk}_$(git describe).apk"
done
if [ -n "$TAGNAME" ]; then

4
xwords4/android/scripts/install_all.sh
View file

@ -10,8 +10,6 @@ usage() {
exit 1
}
[ -e $APK ] || usage "$APK not found"
DEVICES=""
while [ $# -ge 1 ]; do
@ -34,6 +32,8 @@ while [ $# -ge 1 ]; do
shift
done
[ -e $APK ] || usage "$APK not found"
if [ -n "$DEVICES" ]; then
echo "installing this binary. Check the age..."
ls -l $APK

7
xwords4/common/comms.c
View file

@ -858,8 +858,11 @@ comms_checkAddr( DeviceRole role, const CommsAddrRec* addr, XW_UtilCtxt* util )
CommsConnType
comms_getConType( const CommsCtxt* comms )
{
CommsConnType typ = !!comms ? comms->addr.conType : COMMS_CONN_NONE;
if ( !comms ) {
CommsConnType typ;
if ( !!comms ) {
typ = comms->addr.conType;
} else {
typ = COMMS_CONN_NONE;
XP_LOGF( "%s: returning COMMS_CONN_NONE for null comms", __func__ );
}
return typ;