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
7229d110a0
go ahead an up the beta version number too
2015-02-23 21:51:25 -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
3dd16b5883
alert on receiving phone when SMS sender is using older/incompatible protocol.
2015-02-18 06:49:43 -08:00
Eric House
7e8c30f2ab
add preference controlling whether radio-free short-circuiting is used
...
for SMS sends when sending and receiving number are the
same. Short-circuiting is faster and tests 99% of the code without
triggering Android's annoying OS-level too-many-sms-sends alerts, but
sometimes you need to test the radio too.
2015-02-17 20:16:44 -08:00
Eric House
385220cf92
add debug preference, unused so far, for faking the type of radio I
...
have. Goal's to debug non-GSM devices correctly hiding all references
to play-via-SMS.
2015-02-13 18:52:13 -08:00
Eric House
98fe7eb343
if BT's off, offer to turn it on programatically rather than telling
...
user to do it himself
2015-02-13 18:38:24 -08:00
Eric House
49024ae070
offer to turn SMS on when setting the global pref too
2015-02-13 18:16:30 -08:00
Eric House
9399ddd0ab
add a bit of space to the custom view
2015-02-12 21:12:28 -08:00
Eric House
6cfedf7fb5
fix button being missing at the wrong time
2015-02-12 19:24:32 -08:00
Eric House
1a94bab9e8
add naming of game to game creation, including adding custom view to alert
2015-02-12 07:41:28 -08:00
Eric House
2142c752bf
factor confirm-unlimited-SMS stuff out into utility dialog so I can
...
turn on SMS from outside preferences -- which is a much better
experience than sending somebody into the prefs labyrinth
2015-02-11 07:51:19 -08:00
Eric House
4ddf11387f
make send-nfc-to-self available through a debug-only preference rather
...
than only on DEBUG builds.
2015-02-05 06:56:04 -08:00
Eric House
c2a87c187d
as a DEBUG-only feature, enable "send" of NFC to self to better
...
duplicate on a single device how real devices are meant to be
inviting.
2015-02-04 22:15:20 -08:00
Eric House
2c7469f228
emphasize button by centering it rather than making it green, since
...
color replacing a drawable looks like crap and the ways of doing it
right are too complicated and may not look good on all devices/OS
versions.
2015-02-04 07:21:17 -08:00
Eric House
e0a337ff4c
deal with case where user removes existing game's ability to connect:
...
refuse to save until something's put back
2015-02-03 22:11:13 -08:00
Eric House
8abe7720c8
don't allow saving/playing a multi-divice game that doesn't have at
...
least one way of connecting. Instead, give a choice between discarding
it and editing, and if the latter choice it taken open the alert for
picking ways to connect. Requires a new version of showConfirmThen()
that lets the negative button be other than "Cancel".
2015-02-01 22:15:06 -08:00
Eric House
46c4cc0669
warn when user disables all communication options in prefs
2015-01-31 23:17:13 -08:00
Eric House
0972e07b4e
give download button a green background for greater visibility
2015-01-27 21:42:42 -08:00
Eric House
a4842bdaab
just hide the "hide title" pref on devices where it's a no-op --
...
rather than explain to a user why his action is being ignored
2015-01-27 21:40:22 -08:00
Eric House
1b6f0de8e6
inset checkbox for better visibility
2015-01-27 08:24:06 -08:00
Eric House
fb13c949e8
re-enable ActionPairs stuff now that an additional button works/fits.
2015-01-27 08:14:06 -08:00
Eric House
5cece9f3cc
Merge remote-tracking branch 'sf/android_branch' into android_multi2
...
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-01-27 07:53:42 -08:00
Eric House
828b620c44
make "do not show again" a checkbox instead of a button -- requires a
...
trivial custom view.
2015-01-27 07:46:18 -08:00
Eric House
41a2655248
move newbie hint about hiding newgame buttons to the buttons
...
themselves, and disable third button because it isn't shown on the
devices I'm testing on. Not sure why. Tweak text to make sense in that
context.
2015-01-27 07:11:49 -08:00
Eric House
5f5e35e885
hide (the right way) play-via-sms preference on non-gsm phones
2015-01-26 07:06:43 -08:00
Eric House
74ce8116ea
don't allow to enable SMS or BT if the feature's off on the phone, and
...
warn via an alert (varies by whether in prefs or game config) in that case.
2015-01-25 17:40:23 -08:00
Eric House
2c5cf9da39
move conn-via set manipulation into a custom view prefs and game
...
config can both use.
2015-01-25 16:14:34 -08:00
Eric House
b851427fd9
tweak string
2015-01-25 15:17:28 -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
9806b01d6b
get rid of send-invitation menuitem, since it's never there unless
...
there's a dialog in front of the board forcing you to send an
invitation.
2015-01-24 16:32:11 -08:00
Eric House
56e61061be
add alert explaining "just tap" when user picks nfc for sending invite
2015-01-24 14:29:49 -08:00
Eric House
dd6aa95068
force invite alert to stay up as long as a host has players missing.
2015-01-24 14:18:30 -08:00
Eric House
17f4e35bf4
tweak wording
2015-01-24 12:57:42 -08:00
Eric House
b2781afeb3
offer to hide newgame buttons via augmented showNotAgainDlgThen shown
...
when player has five or more games in list.
2015-01-24 12:47:22 -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
9b0eba8be6
up copyright for the new year
2015-01-24 08:54:06 -08:00
Eric House
f48d79d4c8
provide default default language name (and rename string constant
...
being used that way now too)
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-01-23 08:35:04 -08:00
Eric House
178156b7d7
Add UI to invite via SMS more than one player per device (if the
...
"Advanced" option is enabled).
2015-01-23 08:19:20 -08:00
Eric House
bfd6b2162d
swap two config positions
2015-01-22 07:39:07 -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
e5ac525087
provide default default language name (and rename string constant
...
being used that way now too)
2015-01-16 21:28:59 -08:00
Eric House
306c9ef4b6
hide relay-related stuff when relay communication not enabled; remove
...
sms status stuff altogether.
2015-01-13 21:59:54 -08:00
Eric House
d1c300d752
string tweak
2015-01-13 21:51:27 -08:00
Eric House
7e28d2004b
add button to game config activity for changing the connection types to be used in that game
2015-01-13 21:27:51 -08:00
Eric House
1139b1d5d1
put some space before all but the first heading
2015-01-13 19:42:19 -08:00
Eric House
50f29383f5
tweak invite message to not require all invitations to be sent at once
2015-01-05 07:41:31 -08:00
Eric House
6da1b54636
add preference controlling whether more than on player is invited per
...
remote device
2015-01-05 06:32:16 -08:00
