xwords/xwords4/android/XWords4
Eric House b7694b67d2 Merge branch 'android_branch' into android_dualpane2. Compiles after a ton of conflict resolution and some file removal. No idea if it runs, but little confidence.
Conflicts:
	xwords4/android/XWords4/.gitignore
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res/values/styles.xml
	xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
	xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/Delegator.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/InviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/ListDelegateBase.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayGameDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditDelegate.java
	xwords4/android/scripts/adb-install.sh
	xwords4/android/scripts/find-and-ant.sh
2016-03-11 22:19:37 -08:00
..
app remove Android Studio metadata. 2016-02-25 21:34:00 -08:00
archive store and present chat sender's name instead of the lame "Me"/"Not me" 2016-03-06 07:03:54 -08:00
assets up version and changelog for new release 2016-02-19 07:10:28 -08:00
gradle/wrapper add exactly as came from modified sample app 2015-11-11 18:55:24 -08:00
img_src add missing image 2015-08-24 07:42:36 -07:00
jni store and present chat sender's name instead of the lame "Me"/"Not me" 2016-03-06 07:03:54 -08:00
libs Cleanup: get rid of ListActivity. Eventually all Activities need to 2015-11-24 08:01:16 -08:00
res Merge branch 'android_branch' into android_dualpane2. Compiles after a ton of conflict resolution and some file removal. No idea if it runs, but little confidence. 2016-03-11 22:19:37 -08:00
res_src Merge branch 'android_branch' into android_dualpane2. Compiles after a ton of conflict resolution and some file removal. No idea if it runs, but little confidence. 2016-03-11 22:19:37 -08:00
src/org/eehouse/android/xw4 Merge branch 'android_branch' into android_dualpane2. Compiles after a ton of conflict resolution and some file removal. No idea if it runs, but little confidence. 2016-03-11 22:19:37 -08:00
.gitignore Merge branch 'android_branch' into android_dualpane2. Compiles after a ton of conflict resolution and some file removal. No idea if it runs, but little confidence. 2016-03-11 22:19:37 -08:00
AndroidManifest.xml Merge branch 'android_branch' into android_dualpane2. Compiles after a ton of conflict resolution and some file removal. No idea if it runs, but little confidence. 2016-03-11 22:19:37 -08:00
build.gradle move to sdk-22 breaks jni on x86, so revert to -19 for now. 2016-03-06 09:59:22 -08:00
build.xml send the correctly calculated hash value, and up strings for another 2016-01-03 20:23:46 -08:00
build_unchecked.xml version of build.xml modified to pass -xline to javac. For future use... 2010-11-05 05:06:04 -07:00
gradle.properties add exactly as came from modified sample app 2015-11-11 18:55:24 -08:00
gradlew add exactly as came from modified sample app 2015-11-11 18:55:24 -08:00
gradlew.bat add exactly as came from modified sample app 2015-11-11 18:55:24 -08:00
proguard-project.txt adding file required for proguard 2014-07-14 21:46:09 -07:00
project.properties move to sdk-22 breaks jni on x86, so revert to -19 for now. 2016-03-06 09:59:22 -08:00
settings.gradle add exactly as came from modified sample app 2015-11-11 18:55:24 -08:00