Eric House
c35020ef97
Merge branch 'android_branch' into android_dualpane2
...
Conflicts:
xwords4/android/XWords4/archive/R.java
2016-03-13 17:27:02 -07:00
Eric House
d208e4ef51
ignore more AS metadata
2016-03-12 17:38:25 -08:00
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
Eric House
830d66e538
ignore AS metadata
2016-02-25 21:37:15 -08:00
Eric House
87edd09ab6
Cleanup: get rid of ListActivity. Eventually all Activities need to
...
inherit from FragmentActivity since there's no List-aware equivalent,
so XWListActivity now extends XWActivity and nearly all its methods go
away. getListView() and friends are all I needed to implement --
apparently.
2015-11-24 08:01:16 -08:00
Eric House
adbc3615c1
changes to run under gradle
2015-11-11 18:59:00 -08:00
Eric House
ca83f2ab8b
add exactly as came from modified sample app
2015-11-11 18:55:24 -08:00
Eric House
96eacabf10
snapshot: tons of changes toward dual-pane. Board opening is about
...
all that works.
2014-08-01 06:39:09 -07:00
Eric House
591926b46c
adding file required for proguard
2014-07-14 21:46:09 -07:00
Eric House
64b783da38
ignore generated file
2013-11-13 07:52:52 -08:00
Eric House
d838151c0c
modify build system to generate .png files from .svg files, with one
...
.svg as an example.
2013-10-18 22:36:45 -07:00
Eric House
0e7fcf7b51
ignore new obj dir
2012-01-03 18:27:15 -08:00
Eric House
47884b8387
ignore new tools-generated file
2011-12-01 19:50:22 -08:00
Eric House
d5eca2027a
remove local.properties, and add a script, run from build.xml before
...
local.properties is loaded, to generate it with a path to sdk
appropriate to the installation.
2010-06-20 09:29:13 -07:00
Andy2
448cb63891
remove TODO
2010-06-16 18:26:37 -07:00
Eric House
cbbaeb57a0
gitignore additions
2010-06-05 07:50:09 -07:00
eehouse
3e8d4220f5
hide .apk file
2010-02-25 04:51:16 +00:00
eehouse
2d22ef1f6a
hide more files/dirs
2010-02-24 04:29:54 +00:00
eehouse
c6e9cb36d0
add .gitignore
2010-02-23 06:05:56 +00:00
