Eric House
794bce1ceb
cleanup from review of diff since last release. All whitespace or
...
removing logging except for one check for null.
2016-01-27 07:31:10 -08:00
Eric House
b289154e19
up app version strings, changes list for new release
2016-01-21 20:56:45 -08:00
Eric House
dffaf2335e
get rid of Dialog theme for invite activities for Dbg version too
2016-01-13 06:48:13 -08:00
Eric House
a1e381e722
up version code to match main variant
2016-01-04 07:22:59 -08:00
Eric House
efd47d731a
send the correctly calculated hash value, and up strings for another
...
release. This is the minimum required for a new release on top of the
previous one, but not enough if released on this branch!
2016-01-03 20:23:46 -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
22dde029c8
Merge tag 'android_beta_100' into android_branch
...
ready for release
2016-01-03 11:36:37 -08:00
Eric House
a51b01491d
up strings for new version, and copyright for new year
2016-01-02 09:21:59 -08:00
Eric House
8dfddea508
up initial client vers id sent to relay
2016-01-01 21:09:10 -08:00
Eric House
9ddee9790d
Merge tag 'android_beta_99' into android_branch
...
ready for fix-marshmallow-bt release
2015-12-30 06:41:39 -08:00
Eric House
ec9f233fdd
fix assertion, and up version code since I already uploaded a beta to
...
google
2015-12-27 20:48:41 -08:00
Eric House
5d82636c26
allow using env variables in ant files
2015-10-30 05:42:27 -07:00
Eric House
058be41265
change file name
2015-10-22 06:18:47 -07:00
Eric House
f29d302f06
implement context menus for group items too, and add select/deselect
...
items for both -- for groups because there's no other way to select
now. Still not sure how to educate users about the change or to
provide a choice (if it's worth doing).
2015-10-21 06:31:09 -07:00
Eric House
6aa994e2c6
first cut at putting back context menus. For games only (not groups),
...
and done by duplicating the .xml file. TODO: support groups, unify
menu .xml files, and have a user preference controlling whether
context menus are available or at least a newbie info explaining the
change.
2015-10-20 06:21:43 -07:00
Eric House
873e0c7e92
make dbg variant "debuggable"
2015-09-23 19:01:21 -07:00
Eric House
c81f035133
Merge branch 'android_branch' into relay_noconn
2015-08-25 06:40:42 -07:00
Eric House
2aa9740814
up strings and changelog for new release
2015-08-25 05:24:58 -07:00
Eric House
b79836c61b
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-08-24 07:52:46 -07:00
Eric House
1df48d2792
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
2015-08-21 07:17:31 -07:00
Eric House
e0327b0f62
ignore files
2015-08-20 07:41:48 -07:00
Eric House
3898a85f18
catch version code up
2015-08-13 07:34:34 -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
00e6a80fb0
fix permission and other constants that need to be different in variant
2015-08-10 07:07:33 -07:00
Eric House
1d14d4cc65
ignore new files
2015-08-10 06:52:31 -07:00
Eric House
c3aeefe706
bring over changes for permissions etc
2015-08-10 06:52:19 -07:00
Eric House
6871ef24a6
move several strings, including app name, NBS port, and url prefix, into generated
...
.xml file so Dbg and regular variants can co-exist better
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-08-03 04:55:59 -07:00
Eric House
8182fc7822
move several strings, including app name, NBS port, and url prefix, into generated
...
.xml file so Dbg and regular variants can co-exist better
2015-08-01 22:40:24 -07:00
Eric House
0425df7a5e
move several strings, including app name, NBS port, and url prefix, into generated
...
.xml file so Dbg and regular variants can co-exist better
2015-08-01 22:39:00 -07:00
Eric House
81834bcbfa
provide app name in variant too to fix empty substitution errors
...
(e.g. About menutem)
2015-07-31 07:14:11 -07:00
Eric House
f368eb0283
provide app name in variant too to fix empty substitution errors
...
(e.g. About menutem)
2015-07-31 07:10:19 -07:00
Eric House
7c8c6bb55b
move app name into resource that's not copied to fix dbg variant
...
having empty name (though it didn't before)
2015-07-25 08:52:33 -07:00
Eric House
d67245282b
merge in a year's worth of changes
2015-07-25 08:45:28 -07:00
Eric House
48e019f216
upgrade crittercism jar
2015-07-25 08:44:46 -07:00
Eric House
e62993f60e
ignore all the new files being copied over
2015-07-25 08:23:12 -07:00
Eric House
5230593276
update with new receivers
2014-08-09 18:09:49 -07:00
Eric House
6ac5f2177f
catch up with recent changes
2014-07-21 22:13:32 -07:00
Eric House
27972d10e7
new files to ignore
2014-06-18 20:23:58 -07:00
Eric House
9bf92257b9
ignore more stuff
2014-05-19 07:54:08 -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
f5f7428683
fix debug tree to build again, this time with a paramaterized common
...
xml file
2014-04-16 21:06:41 -07:00
Eric House
ef381f1d71
hide more files (changes generated)
2014-03-24 20:27:19 -07:00
Eric House
9af9e2089b
ignore more files in dbg dir
2014-03-24 19:54:35 -07:00
Eric House
c982fb54d9
up strings and notes for new release
2014-03-06 06:47:43 -08:00
Eric House
de7638525a
commit sdk-generated file (might be better to ignore it?)
2014-02-13 06:31:31 -08:00
Eric House
61334efa1a
fix to generate rather than copy
2014-02-12 07:35:12 -08:00
Eric House
ea6da8cd74
add crittercism library
2014-02-10 18:55:16 -08:00
Eric House
bdfbb3ffca
update bt build, adding new .java file and logic to copy gcm.jar rather than commit a copy of it.
2014-02-10 18:30:19 -08:00
Eric House
d02481879b
catch debug variant up with recent changes and lay groundwork for including crittercism in it.
2014-02-10 07:31:52 -08:00
Eric House
905be85e92
add temp menu that gets a phone number and sends an NBS message to it,
...
and modify NBSReceiver to print sender phone number and message
contents. Works for send-to-self!
2012-03-13 07:51:45 -07:00
