Eric House
7087ae96ff
cleanup: resolve diffs between AndroidManifest.xml versions
2016-11-09 08:40:17 -08:00
Eric House
154e428fa8
more work on wifi direct
...
Now sends and receives a single packet more often than not. Disabled for
non-DEBUG devices, and new permissions that are required are commented
out so I don't accidentally ship before the sdk-23 permissions stuff
makes additions less scary.
2016-11-07 07:02:27 -08:00
Eric House
540a720fb7
up release strings
2016-10-25 20:06:10 -07:00
Eric House
c16fda23af
up strings for new release
2016-09-02 21:37:37 -07:00
Eric House
cd0de1daa7
ready for interim release
...
up version strings and make a toast DEBUG-only
2016-08-29 06:33:27 -07:00
Eric House
16b9bab719
up version strings and changes list
2016-08-19 11:58:10 -07:00
Eric House
d0b64f8f51
Merge branch 'android_108_release' into android_branch
2016-07-18 10:17:44 -07:00
Eric House
4f067edece
up version code (since already uploaded as a beta)
2016-07-18 09:31:41 -07:00
Eric House
12b1f3e38b
rename GamesListActivity -> MainActivity
2016-07-10 13:09:20 -07:00
Eric House
c3817ef452
change version strings for new release
2016-07-08 06:18:07 -07:00
Eric House
e703ae7ec5
get rid of Main activity. Next release I need to find a way at launch
...
time to choose between dual-pane and regular mode that doesn't mess
up sending Intents and make it harder to prevent there being
multiple instances of activities that are supposed to be single-top.
2016-06-26 14:28:17 -07:00
Eric House
608533d189
Merge branch 'from_android_beta_106' into android_branch
2016-05-03 06:44:39 -07:00
Eric House
c013c152d7
up version strings for release 107 (f-droid only is the plan)
2016-05-02 21:56:11 -07:00
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
a157c9bb43
up strings and changelog for release
2016-03-12 17:39:18 -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
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
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
bf3c0021a6
up version and changelog for new release
2016-02-19 07:10:28 -08:00
Eric House
2cb989022c
up name and version code for new release
2016-02-03 20:40:46 -08:00
Eric House
5ccb9bf7a3
notes and version code changes for release
2016-02-02 19:41:16 -08:00
Eric House
d3e521ca6e
cleanup
2016-02-02 07:04:29 -08:00
Eric House
b289154e19
up app version strings, changes list for new release
2016-01-21 20:56:45 -08:00
Eric House
f5947d25d9
Make invite dialogs full-screen. They're cramped otherwise.
2016-01-07 08:07:26 -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
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
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
49caf6505a
up strings and changelog for new release
2015-12-21 18:50:04 -08: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
b5ae54f313
use common/native NetLaunchInfo to implement invite-via-relay that
...
works between linux and Android clients. Required renaming so struct
names and names of fields within match in c and java code. The point
is to test this as the foundation of rematch: now you have to type in
a deviceID in order to invite, which clearly sucks for users. Either
that goes away, or it's replaced with something that scans existing
games and lists past opponents as possible invitees.
2015-07-10 23:19:38 -07:00
Eric House
e7dc14a4e7
Merge branch 'for_android_beta_96' into android_branch (and up version strings)
...
Conflicts:
xwords4/android/XWords4/assets/changes.html
2015-04-07 21:08:00 -07:00
Eric House
fe9b70b7e1
up strings for release
2015-04-07 20:45:45 -07:00
Eric House
fa6c043433
Merge remote-tracking branch 'sf/android_branch' into android_multi2
...
# 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-03-04 07:32:43 -08:00
Eric House
b967c39c20
up strings for release
2015-03-04 06:56:12 -08:00
Eric House
736e5f1ea0
prevent keyboard from coming up on launch of game config activity;
...
instead wait until room name is tapped. (I did this in two places
though one might have been enough. On some devices anyway that
AndroidManifest change is needed to close a keyboard if it's open
prior to opening the activity.)
2015-03-04 06:17:18 -08:00
Eric House
da3452f3fa
Merge remote-tracking branch 'sf/android_branch' into android_multi2
...
# 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-02-24 06:46:16 -08:00
Eric House
64cf060c4e
up version code and add to changelist
2015-02-23 21:35:42 -08:00
Eric House
86d8a46da2
Merge branch 'android_branch' into android_multi2
...
Conflicts:
xwords4/common/comms.c
2015-02-18 19:40:36 -08:00
Eric House
b89395ffb9
up strings for new release
2015-02-18 19:24:17 -08:00
Eric House
f983e477a2
remove all code for sending and receiving non-data SMS. The plan is
...
that SMS will only be supported for GSM phones from here out (unless
Google figure out how to make the Data SMS APIs work on CDMA devices.)
2015-01-25 13:56:33 -08:00
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
44624b20d9
up strings and changes list for release
2015-01-24 08:59:44 -08:00
Eric House
f8e530da9b
Snapshot toward making SMS work again: invites now work via
...
user-visible SMS, providing a URL same as email that launches the app
with a new game. Game works sending via NBS (data SMS) when both
devices are on GSM (T-mobile, anyway.) Plan is to use os version and
gsm info included in invite to warn user when the game can't
communicate, but that test isn't done yet. Also removed debug pref
allowing to force send by NBS.
2015-01-18 10:49:15 -08:00
Eric House
71839b1e85
add READ_PHONE_STATE permission so I can send my phone number in invitatiosn
2015-01-17 22:00:43 -08:00
Eric House
11f7083eb6
remove dead classes and layouts; add menu to create networked games.
2014-11-15 20:42:09 -08:00
