Commit graph

264 commits

Author SHA1 Message Date
Eric House
027cd319e6 Merge branch 'android_branch' into android_multi2
Conflicts:
	xwords4/android/XWords4/archive/R.java
2015-01-24 10:10:10 -08:00
Eric House
e0c9d626ae rename script 2015-01-23 08:30:19 -08:00
Eric House
301ce8bc3c spelling error in comment :-) 2014-11-20 18:57:57 -08:00
Eric House
64276b041e echo so I know it's doing something 2014-11-15 20:37:22 -08:00
Eric House
452729fb9d merge android_branch 2014-10-17 18:36:08 -07:00
Eric House
3dfb4ae6f8 Merge remote branch 'origin/android_branch' into android_branch 2014-10-16 20:48:39 -07:00
Eric House
39f8ec4734 expand pattern to match newer .apks 2014-10-16 20:47:43 -07:00
Eric House
dd00ba477b fix mistaken commit: uncomment 2014-10-16 20:16:35 -07:00
Eric House
878a16b3bc snapshot: android compiles, and works well enough to exchange moves
via relay!  Lots of changes, mostly around treating connTypes as a Set
inside the java world.  Jni to translate to that is a pain.
2014-10-16 06:45:24 -07:00
Eric House
f14c3216a5 commit changes that have been running for a while 2014-10-13 19:10:56 -07:00
Eric House
bf1f0485df include git hash in name of .apk file 2014-10-13 19:06:40 -07:00
Eric House
858187b9d7 include git rev hash in update info -- for later use detecting when a
tagged build has changed
2014-10-13 07:20:17 -07:00
Eric House
e69f0179cc fix script 2014-09-21 16:59:00 -07:00
Eric House
473bea77d6 get rid of -i param; instead install to all devices instead of passing
'install' to ant.
2014-09-08 07:25:05 -07:00
Eric House
c1ee254c4f echo what's going on 2014-09-05 21:19:32 -07:00
Eric House
5035042ce4 rename script, and add install option so can work with multiple devices 2014-09-05 07:29:03 -07:00
Eric House
b9d9fc2520 put back auto-scp of finished file to server 2014-08-29 07:33:21 -07:00
Eric House
4df0f7ffd2 add option to get new .apk file name into a file 2014-08-29 07:21:54 -07:00
Eric House
031cd613c1 Don't upload .apk as part of this script. Maybe later as part of -clone.sh. 2014-07-14 21:40:31 -07:00
Eric House
4d9c7c97ba Merge remote branch 'origin/android_localize' into android_localize 2014-06-24 08:16:56 -07:00
Eric House
d1f3648390 better shelf clearing 2014-06-24 08:16:01 -07:00
Eric House
e3ca40c221 make prompt clearer 2014-06-22 11:15:44 -07:00
Eric House
2c7128ad30 pull note out of dict header 2014-06-18 20:18:09 -07:00
Eric House
b3852ba603 cast to int so doesn't get turned into a string on the java side 2014-06-18 06:46:45 -07:00
Eric House
3e107a82e2 include word count and file size 2014-06-18 05:18:22 -07:00
Eric House
45ebb8d3b9 put dict list info in shelf for faster response 2014-06-07 17:57:43 -07:00
Eric House
d54bbb3beb don't barf when something not found in git history -- just return nothing, as it's the dev case 2014-06-07 17:50:35 -07:00
Eric House
d55dd7e206 change format of downloadable dict info. Late checkin: Android code's
been counting on this for several days.
2014-06-03 07:43:47 -07:00
Eric House
092c0f54c8 include md5sums of dicts in json 2014-05-28 20:45:55 -07:00
Eric House
5d0a6babae add function to list all wordlists by lang in a json -- toward not
using webview for download function.
2014-05-28 07:14:45 -07:00
Eric House
937e1fa9a9 don't upgrade app and translations at the same time (since new app may
behave differently once installed)
2014-05-28 06:43:37 -07:00
Eric House
f87bf2f95d allow non-English strings.xml files to have duplicate text 2014-05-22 06:07:55 -07:00
Eric House
9a9a4e2991 add option to replace %s with %1$d etc. 2014-05-20 20:53:48 -07:00
Eric House
1ebf51d3ab when building from modified tree, still use latest commit number for
about box for easier debugging. Shouldn't matter for releases.
2014-05-19 07:15:21 -07:00
Eric House
f8dbc91cb0 don't set constant if R.java has uncommitted changes 2014-05-19 07:10:29 -07:00
Eric House
c42e5f2c0f keep elipses char where it belongs when reversing rest of strings 2014-05-11 20:15:10 -07:00
Eric House
49001c6893 various changes so dbg and bt versions build again -- and may work, but
that's not tested yet.
2014-05-11 19:55:05 -07:00
Eric House
2a3b8c7a74 when reversing words, preserve capitalization (i.e. start don't end with a cap) 2014-05-10 06:52:26 -07:00
Eric House
c06f0e157d first cut at file to clean up variant trees by removing anything not
under version control
2014-05-10 06:50:55 -07:00
Eric House
30b966b902 generate fake translations automatically 2014-05-06 07:47:29 -07:00
Eric House
c0afd40337 update test section to work again 2014-05-06 07:25:00 -07:00
Eric House
0ff09868cb Query user before removing build dir 2014-05-06 06:58:57 -07:00
Eric House
477019757e make getopt flags match what usage says is there 2014-05-04 16:39:56 -07:00
Eric House
1fcf9027cb when looking for a translation for locale xx_YY, if there is none try
again for just xx. And silently drop strings in the translation file
with names that don't exist in English, though eventually that
shouldn't happen.  With this change a newly installed app on a
claiming-to-be-Czech emulator picks up the Czech translation within
moments.
2014-05-04 16:26:35 -07:00
Eric House
6d60e45eb9 tweak fake translation generation (and include new strings) 2014-05-02 22:08:44 -07:00
Eric House
43f90cb3b0 use -1 as array index 2014-05-02 22:03:02 -07:00
Eric House
ad65b93ef2 changes necessary to actually return a translation based on revision
hash of R.java passed by client, or none if it already has it.  Rough,
but works.
2014-05-02 22:00:25 -07:00
Eric House
8d6f46fa22 snapshot. Should work for current case where the newest R.java is older than the app connecting 2014-05-01 08:15:42 -07:00
Eric House
7b40abfa2f more features and some refactoring 2014-05-01 08:14:40 -07:00
Eric House
164387b37d update to use mygit 2014-04-30 07:25:23 -07:00