Commit graph

365 commits

Author SHA1 Message Date
Eric House
aa4f4e0e99 launch the Main activity after installing 2016-03-12 14:28:40 -08:00
Eric House
5d9de30170 merge remote changes 2016-03-08 07:27:30 -08:00
Eric House
cd93bdb03e move to sdk-22 breaks jni on x86, so revert to -19 for now. 2016-03-06 09:59:22 -08:00
Eric House
d67d9a704c script to make it easier to launch logcat with multiple devices connected 2016-03-06 06:34:25 -08:00
Eric House
ff12cc6f91 tweak scripts to have better default behavior 2016-03-05 12:16:23 -08:00
Eric House
ca41a2390c usage should exit with an error 2016-02-24 22:16:56 -08:00
Eric House
8c3f1ee100 up sdk version to 22 in order to drop timestamp from marshmallow logs
(since they provide it natively)
2016-02-24 07:12:10 -08:00
Eric House
3a94f38820 use android-19 instead of -14, which seems to be no longer supported 2016-02-21 13:36:57 -08:00
Eric House
19d1a6059e new script for working with gradle builds. Probably totally broken:
I'm committing it now because I'm tired of it being in the way during
branch changes.
2016-02-19 07:12:00 -08:00
Eric House
05e82d4ee7 find apks from android root; print cmd in way it can be run from shell 2016-02-18 06:39:06 -08:00
Eric House
c09088658e rewrite to search for variants and attached devices when none
specified, and more. Requires modern bash now rather than /bin/sh.
2016-02-17 07:34:10 -08:00
Eric House
75939d9203 remove bogus flag (incompatible with my key). And confirm that can be
installed on top of a build signed with SHA256, the new default.
2016-02-01 06:27:29 -08:00
Eric House
36551a310a add jarsigner params that are supposed to fix for installing on older devices 2016-02-01 06:17:36 -08:00
Eric House
5ef7495d51 The Japanese translation has a number of plurals with "one" quantities
but no "other", which crashes. "Fix" these by making the copy script
turn one into other, which may well make sense given Japanese
grammer. At any rate it prevents crashes until I can work it out with
the translator and/or weblate.
2016-01-23 21:59:31 -08:00
Eric House
c0e8f9cb65 look for plurals too 2016-01-23 21:06:37 -08:00
Eric House
ca09c48d95 deal with case where target of symlink is gone 2016-01-23 20:55:32 -08:00
Eric House
5c14ad3f22 Merge remote-tracking branch 'origin/android_branch' into android_translate 2016-01-07 07:30:15 -08:00
Eric House
07dd7f2eed use a different name for each variant's db when written to SD card so
they don't overwrite each other's.
2016-01-03 20:19:46 -08:00
Eric House
b8c597ab98 oops -- fix prematurely committed script. 2016-01-03 19:53:16 -08:00
Eric House
ba712046a2 add git version to file in assets/ so can tell .apk's version in
filesystem (before it's installed).
2016-01-03 19:27:33 -08:00
Eric House
22dde029c8 Merge tag 'android_beta_100' into android_branch
ready for release
2016-01-03 11:36:37 -08:00
Eric House
6ce1fbe465 add red Dbg to the middle of variant's icon 2015-12-30 05:53:37 -08:00
Eric House
db9c079356 fix to show files appearing in only one apk 2015-12-05 11:13:13 -08:00
Eric House
4e14477faf script to compare .apk files, meant to aid in confirming that gradle
and ant are producing the same thing.
2015-12-04 21:51:10 -08:00
Eric House
58bf3ba07b Merge remote-tracking branch 'maidu2/android_branch' into android_branch
Conflicts:
	xwords4/android/XWords4/.gitignore
	xwords4/android/XWords4/build.gradle
	xwords4/android/scripts/common_targets.xml
2015-11-11 22:36:19 -08:00
Eric House
aa11bb50de fix to work with modified script 2015-11-11 22:23:39 -08:00
Eric House
adbc3615c1 changes to run under gradle 2015-11-11 18:59:00 -08:00
Eric House
9f28e5c350 more gradle improvements. Seems to build a usable .apk, but isn't
doing release/debug right yet.
2015-11-05 20:19:07 -08:00
Eric House
5d81b3375b add support for fetching devIDs for connnames, required to allow
inviting based on existing relay games.
2015-10-15 06:32:11 -07:00
Eric House
122335c53c Merge branch 'android_branch' into relay_noconn
# 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.
2015-09-17 07:00:04 -07:00
Eric House
a9ddf98541 Merge branch 'android_branch' into android_translate 2015-09-16 07:08:53 -07:00
Eric House
34ecd92ff5 script to copy translation data from android_translate branch 2015-09-16 07:01:09 -07:00
Eric House
f3d8f0b8ee pass V=1 to ndk build script to make cc calls verbose 2015-09-15 20:57:39 -07:00
Eric House
05d0974823 Merge remote-tracking branch 'origin/android_branch' into android_branch
# 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.
2015-09-15 20:46:35 -07:00
Eric House
759cd36162 Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch
Conflicts:
	xwords4/android/XWords4-dbg/AndroidManifest.xml
	xwords4/android/scripts/mkvariant.sh
2015-09-10 18:34:28 -07:00
Eric House
be44613773 Merge branch 'android_branch' into relay_noconn
Conflicts:
	xwords4/android/XWords4/archive/R.java
2015-08-27 07:53:14 -07:00
Eric House
47f8bd8125 Merge branch 'android_branch' into android_translate 2015-08-27 06:42:44 -07:00
Eric House
8e17e43d9a fix to not stop removing after removing the first elem 2015-08-27 06:41:47 -07:00
Eric House
be64f78252 Merge branch 'android_branch' into android_translate
# 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.
2015-08-24 07:44:58 -07:00
Eric House
690f248e27 ignore case where no files exist (so that /* doesn't expand) 2015-08-24 07:39:24 -07:00
Eric House
c35acdd773 ignore case where no files exist (so that /* doesn't expand) 2015-08-24 07:35:00 -07:00
Eric House
daaa346bb5 generate local.properties if running for first time 2015-08-24 07:24:28 -07:00
Eric House
f7f4825c67 deal with case where file doesn't exist 2015-08-16 09:25:00 -07:00
Eric House
265ac48b88 Merge branch 'android_branch' into relay_noconn
Conflicts:
	xwords4/android/XWords4-dbg/AndroidManifest.xml
	xwords4/android/XWords4-dbg/res/layout/.gitignore
	xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
2015-08-10 07:37:03 -07:00
Eric House
a320c81009 Merge branch 'android_branch' into android_translate
Conflicts:
	xwords4/android/XWords4/res_src/values-ca/strings.xml
	xwords4/android/scripts/fix-loc-xmls.py
2015-08-10 06:56:31 -07:00
Eric House
2ef407320e pick package based on location 2015-08-10 06:43:19 -07:00
Eric House
87e3108296 cleanup: make work based on location if target not specified 2015-08-10 06:23:24 -07:00
Eric House
bc18f33e5d generate local.properties if running for first time 2015-08-06 21:24:56 -07:00
Eric House
134ef851f6 generate local.properties if running for first time 2015-08-06 21:01:15 -07:00
Eric House
8b90f211ed progress: compares english and other languages use of format
specifiers, but I think is missing mismatches in plurals still.
2015-08-05 07:19:39 -07:00