Commit graph

4312 commits

Author SHA1 Message Date
Eric House
5e3ae54e2e cleanup 2015-09-24 06:50:26 -07:00
Eric House
37094b72f3 fix crash, and clean up rematch game naming code. Deals with solo
games too though not used.
2015-09-23 19:11:43 -07:00
Eric House
7783021fd7 give player a chance to name rematch game, and provide default that
includes opponent's name
2015-09-23 07:53:49 -07:00
Eric House
b73b29fcca log what's sent too -- for debugging update process 2015-09-22 20:39:37 -07:00
Eric House
8a2ca8195e log bad json data 2015-09-22 20:23:08 -07:00
Eric House
a2fb6045a8 tweak move reminder strings 2015-09-22 20:21:58 -07:00
Eric House
bfce38c088 use a hash map instead of a bunch of str-compares. 2015-09-22 20:18:27 -07:00
Eric House
b3a93cc474 Make separate turn reminder disable prefs for solo and networked
games, as some folks playing against the robot don't need to be
reminded. From a feature request submitted via sourceforge.
2015-09-22 07:35:02 -07:00
Joan Montané
5f3a029ff7 Translated using Weblate (Catalan)
Currently translated at 100.0% (689 of 689 strings)
2015-09-22 00:09:57 +02:00
Sylvie
757add997b Translated using Weblate (Dutch)
Currently translated at 100.0% (689 of 689 strings)
2015-09-21 18:44:15 +02:00
Eric House
cb1d7dff71 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-21 07:14:01 -07:00
Eric House
b3a2e28647 copy over from android_translate branch 2015-09-17 19:38:00 -07:00
Eric House
311015103e Merge remote-tracking branch 'weblate/android_translate' 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-09-17 19:36:18 -07:00
Sylvie
b30822e488 Translated using Weblate (Dutch)
Currently translated at 100.0% (689 of 689 strings)
2015-09-17 16:58:43 +02:00
Eric House
6f3b80cc68 catch up with recent changes 2015-09-17 07:11:39 -07:00
Eric House
81b8f9bcf6 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-09-17 07:09:44 -07:00
Eric House
3040d7f487 use new protocol for next release 2015-09-17 07:06:59 -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
db1f569430 in chat window, don't show send menu item unless text is non-empty 2015-09-17 06:59:02 -07:00
Eric House
a9ddf98541 Merge branch 'android_branch' into android_translate 2015-09-16 07:08:53 -07:00
Eric House
6eb2e8e174 pull in latest French translation 2015-09-16 06:49:52 -07:00
Eric House
0ce2d50504 merge latest French translation 2015-09-16 06:47:46 -07:00
Eric House
5d59bcd011 Revert to old proto since the version that's out there now won't work
with the new. Can switch once this version's distributed.
2015-09-16 06:42:01 -07:00
Eric House
1a258be2f4 merge in latest from android_translate branch 2015-08-27 21:57:19 -07:00
Eric House
2d0dc6e192 Merge remote-tracking branch 'weblate/android_translate' into android_translate
Conflicts:
	xwords4/android/XWords4/res_src/values-fr/strings.xml
2015-08-27 21:55:08 -07:00
Bernard Massot
a09e60d06e Translated using Weblate (French)
Currently translated at 99.8% (689 of 690 strings)
2015-08-27 19:39:09 +02: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
75eb955050 Merge branch 'android_branch' into android_translate
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-27 07:46:45 -07:00
Eric House
53025f8a99 clean up plurals, adding quantity="one" elements in a few places where
they make sense, collapsing a plurals to a string where that made
sense (there will probably never be a one-word wordlist), and removing
an unused plurals.
2015-08-27 07:42:16 -07:00
Eric House
47f8bd8125 Merge branch 'android_branch' into android_translate 2015-08-27 06:42:44 -07:00
Eric House
db7aa3923b 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-08-26 07:09:56 -07:00
Eric House
a4e25576ad bring over changes from android_translate branch (via brute-force copy) 2015-08-26 07:00:54 -07:00
Eric House
0e3044bb16 fix what looks like a weblate bug: replace empty <other> elem with
what was there before.
2015-08-26 06:49:15 -07:00
Weblate
d1b25999a3 Merge remote-tracking branch 'origin/android_translate' into android_translate 2015-08-26 07:42:41 +02:00
Bernard Massot
0b1ba099e2 Translated using Weblate (French)
Currently translated at 100.0% (691 of 691 strings)
2015-08-26 07:42:41 +02:00
Eric House
83d3163f0e rename variable 2015-08-25 22:19:00 -07:00
Eric House
c3b2ecdb1d Merge branch 'android_branch' into relay_noconn 2015-08-25 06:46:35 -07:00
Eric House
9a75ef29f2 fix misspelling 2015-08-25 06:46:03 -07:00
Eric House
c81f035133 Merge branch 'android_branch' into relay_noconn 2015-08-25 06:40:42 -07:00
Eric House
41817d896c 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-25 06:39:14 -07:00
Eric House
26114f83a6 fix chat view not being opened if move had arrived after chat by
removing unneeded variable whose presence was clearing flags.
2015-08-25 06:38:14 -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
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
a073ad68ae add missing image 2015-08-24 07:42:36 -07:00
Eric House
bb2ea6a522 remove duplicate strings (likely added by merge when I wasn't paying attention) 2015-08-24 07:17:50 -07:00
Eric House
11aae82051 Merge branch 'android_branch' into android_translate
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
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-08-23 21:54:18 -07:00
Eric House
5fd477be75 use existing string -- Copy to clipboard 2015-08-23 21:52:07 -07:00
Eric House
98bd41bc14 experimental option that puts invite url text into clipboard so user
can invite using app of her choice.

Conflicts:
	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
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-08-23 21:44:45 -07:00
Eric House
6d6c345f94 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-08-23 21:18:05 -07:00
Sylvie
ec3af948e3 Translated using Weblate (Dutch)
Currently translated at 100.0% (691 of 691 strings)
2015-08-23 21:17:16 -07:00
Joan Montané
ab791fb430 Translated using Weblate (Catalan)
Currently translated at 100.0% (691 of 691 strings)
2015-08-23 21:14:34 -07:00
Bernard Massot
8da25dcdd4 Translated using Weblate (French)
Currently translated at 100.0% (691 of 691 strings)
2015-08-23 21:14:20 -07:00
Joan Montané
36689676c5 Translated using Weblate (Catalan)
Currently translated at 100.0% (691 of 691 strings)
2015-08-23 23:13:35 +02:00
Bernard Massot
2b29ec82fe Translated using Weblate (French)
Currently translated at 100.0% (691 of 691 strings)
2015-08-23 21:19:03 +02:00
Sylvie
407d96e343 Translated using Weblate (Dutch)
Currently translated at 100.0% (691 of 691 strings)
2015-08-21 17:22:31 +02: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
8f93630350 shorten string to make action bar more obvious (and catch up with
generated string file changes)
2015-08-21 06:56:47 -07:00
Eric House
598ee7599b Merge branch 'android_branch' into android_translate
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
2015-08-20 07:43:16 -07:00
Eric House
e0327b0f62 ignore files 2015-08-20 07:41:48 -07:00
Eric House
79ab1214e7 replace send button with menuitem, and add icons for it and clear 2015-08-20 07:38:09 -07:00
Eric House
6b455bf743 make chat compose space multi-line; scroll chat history to bottom on
open
2015-08-20 07:37:51 -07:00
Eric House
07e97107ce confirm before deleting chat history
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
2015-08-20 07:37:30 -07:00
Eric House
d08e82220d replace send button with menuitem, and add icons for it and clear 2015-08-20 07:35:01 -07:00
Eric House
ec6b7207b4 make chat compose space multi-line; scroll chat history to bottom on
open
2015-08-20 07:15:20 -07:00
Eric House
f4b39287a5 confirm before deleting chat history 2015-08-20 07:03:21 -07:00
Eric House
e5cf0ee4fb 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-08-19 07:44:17 -07:00
Eric House
a11e5beded goes with prev commit 2015-08-18 06:41:57 -07:00
Eric House
ff3d587179 really only post messages sent toast when user chose the menuitem 2015-08-18 06:41:34 -07:00
Eric House
aee4d9d6a4 goes with prev commit 2015-08-18 06:40:50 -07:00
Eric House
1703a15aca really only post messages sent toast when user chose the menuitem 2015-08-18 06:40:31 -07:00
Eric House
0d8fef5c56 cleanup 2015-08-17 08:01:36 -07:00
Eric House
0d04b176d2 catch up generated strings 2015-08-17 07:13:02 -07:00
Eric House
592f01a767 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-08-17 07:07:59 -07:00
Eric House
6ae73ab99b Merge branch 'android_branch' into android_translate
Conflicts:
	xwords4/android/XWords4/res_src/values-nl/strings.xml
2015-08-17 07:05:58 -07:00
Eric House
cbe2c6f5f3 copy over new translations from translation branch. 2015-08-17 07:04:10 -07:00
Eric House
d6d1bbe2e0 Merge remote-tracking branch 'weblate/android_translate' 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-17 06:46:55 -07:00
Eric House
f5e645f62a 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-08-17 06:41:58 -07:00
Eric House
4b14176386 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-17 06:35:41 -07:00
Eric House
55d67f7599 don't show toast after message send unless user-triggered 2015-08-17 06:34:58 -07:00
Sylvie
29f410a2e0 Translated using Weblate (Dutch)
Currently translated at 100.0% (688 of 688 strings)
2015-08-14 16:11:02 +02:00
Joan Montané
fe86eb9dbf Translated using Weblate (Catalan)
Currently translated at 100.0% (688 of 688 strings)
2015-08-14 12:17:17 +02:00
Eric House
389a09ac1a 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-13 07:30:55 -07:00
Eric House
fd55d27a63 changes left out of previous merge commit for some reason 2015-08-13 07:24:49 -07:00
Eric House
0c39c61725 Merge branch 'android_branch' into android_translate
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-13 07:24:05 -07:00
Eric House
34c70825b9 toward figuring out why relay communication stalls: log network
availability state changes.
2015-08-13 07:06:12 -07:00
Eric House
3a32d3a17b return count of messages sent from comms_resendAll(), and post it as a
toast so user sees something happened.
2015-08-13 07:05:06 -07:00
Eric House
dea75a815e vary common-code logging tag by variant 2015-08-13 07:02:57 -07:00
Eric House
7824df67f5 copy over VARIANT compile-time flag stuff. Not sure how it got dropped
in this branch.
2015-08-13 06:54:07 -07:00
Eric House
19eb677f7c copy over from android_translate branch 2015-08-12 21:36:33 -07:00
Eric House
bae6b3f119 copy over from android_translate branch 2015-08-12 21:34:46 -07:00
Eric House
47954f82d0 add index of sending player to chat transmission, and on receiving
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.

Conflicts:
	xwords4/android/XWords4/archive/R.java
2015-08-12 07:43:20 -07:00
Eric House
b2970069c1 add index of sending player to chat transmission, and on receiving
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.

Conflicts:
	xwords4/android/XWords4/archive/R.java
2015-08-12 07:38:18 -07:00
Eric House
8f7267b3ec add index of sending player to chat transmission, and on receiving
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.
2015-08-12 07:36:36 -07:00
Eric House
4e1a382f1e Merge branch 'android_branch' into relay_noconn
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2015-08-11 07:42:05 -07:00
Eric House
49e2503146 Merge branch 'android_branch' into android_translate 2015-08-11 07:31:06 -07:00
Eric House
be9b8977e5 turn off email invite attachments 2015-08-11 07:30:34 -07:00
Eric House
ef853d2784 cleanup; include generated file 2015-08-11 07:11:03 -07:00
Eric House
b7cb902775 Merge remote-tracking branch 'weblate/android_translate' into android_translate 2015-08-11 07:01:03 -07:00
Eric House
5d2a5b7649 Merge branch 'android_branch' into android_translate 2015-08-11 06:57:27 -07:00
Eric House
4a28da1348 Show specific notification on receipt of chat, not rehash of last move
played.

Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
2015-08-11 06:50:16 -07:00
Eric House
5853b0c5c6 Show specific notification on receipt of chat, not rehash of last move
played.
2015-08-11 06:47:10 -07:00
Sylvie
28bb7f84be Translated using Weblate (Dutch)
Currently translated at 100.0% (687 of 687 strings)
2015-08-11 12:48:40 +02:00
Sylvie
bdf44dfdb2 Translated using Weblate (Dutch)
Currently translated at 100.0% (683 of 683 strings)
2015-08-10 11:40:09 +02:00
Eric House
5bae2dbbd9 experimental option that puts invite url text into clipboard so user
can invite using app of her choice.

Conflicts:
	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
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-08-07 08:00:12 -07:00
Eric House
c99decaf32 experimental option that puts invite url text into clipboard so user
can invite using app of her choice.
2015-08-07 07:55:26 -07:00
Eric House
f06071fb39 new generated strings 2015-08-06 07:37:18 -07:00
Eric House
9e0f72e68b bring over variant-related changes that somehow got dropped from this
branch
2015-08-06 07:25:56 -07:00
Eric House
87fef6b186 delete strings no longer used (missing from english strings.xml) 2015-08-05 07:16:25 -07:00
Eric House
74eedbb314 where a plurals has a "one" quantity and an empty "other", delete the
empty "other" and make the "one" an "other" instead
2015-08-05 07:00:02 -07:00
Eric House
64c5c4c416 remove empty line 2015-08-04 21:01:02 -07:00
Eric House
ec581d1dbd Merge branch 'android_branch' into relay_noconn
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/jni/xwjni.c
	xwords4/android/XWords4/res/values/common_rsrc.xml
2015-08-04 20:17:56 -07:00
Eric House
debe424c8a copy over from android_translate branch 2015-08-04 20:13:19 -07:00
Eric House
68f72451cd Merge remote-tracking branch 'weblate/android_translate' 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-04 19:48:58 -07:00
Eric House
96ef94fead changes from translator 2015-08-04 19:11:07 -07:00
Eric House
ed7d44c8ad add (generated) to-be-translated plurals element 2015-08-04 07:57:39 -07:00
Eric House
dfa6226c1a fix a few plurals' formatting 2015-08-04 07:56:29 -07:00
Eric House
a79d9272b1 fix a bit of formatting (plurals) 2015-08-04 07:56:12 -07:00
Eric House
f4d53ab076 remove string not in English 2015-08-04 07:05:34 -07:00
Eric House
dc4d4aad0e insert missing string 2015-08-03 21:10:32 -07:00
Eric House
59ac6ecddf print in canonical format -- whitespace changes only 2015-08-03 21:09:01 -07:00
Joan Montané
9bbff68eda Translated using Weblate (Catalan)
Currently translated at 100.0% (683 of 683 strings)
2015-08-03 21:12:35 +02:00
Eric House
10c40089e2 fix formatting, mostly of plurals elements 2015-08-03 07:46:09 -07:00
Eric House
a45b698ea9 don't crash when first run without network connection 2015-08-03 05:25:35 -07:00
Eric House
3064420c78 don't crash when first run without network connection 2015-08-03 05:25:10 -07:00
Eric House
013e0e3a4c Merge branch 'android_branch' into android_translate 2015-08-03 05:10:06 -07:00
Eric House
bcd620a4f9 clean up to make cherry-picked changes work 2015-08-03 05:07:49 -07:00
Eric House
cfa101350a add logdf, logging for DEBUG builds only 2015-08-03 05:06:38 -07:00
Eric House
a612a89ac6 fix variant crashes: had forgotten PKG_PATH on new method 2015-08-03 04:59:15 -07:00
Eric House
97bf616db1 Problem: NBS port is being ignored by dispatcher to broadcast
receivers on receiving device, so variants are getting their own and
all other NBS messages. Solution: change protocol to include port
message is meant for so mis-delivered ones can be dropped.
2015-08-03 04:58:46 -07:00
Eric House
1e7f51a88d move last-pressed button to bottom of screen where it's natural to look for it 2015-08-03 04:58:18 -07:00
Eric House
a5f332dd1d different logging TAG for different variants 2015-08-03 04:57:35 -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
1959ff3b2d fix NPE reported by crittercism 2015-08-03 04:54:42 -07:00
Eric House
b500a4646d use different uuid for dbg variant so it's not cross-sending BT
messages with other variants, causing among other problems spurious
"deleted on other device" warnings.
2015-08-03 04:50:56 -07:00
Eric House
2b286fd7ac 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-03 04:45:48 -07:00
Eric House
b56924b030 fix off-by-one error that probably had me slowly leaking local obj
references for the last few years.
2015-08-02 16:43:52 -07:00
Eric House
a148680e44 catch up: it's been a few commits since I included this. 2015-08-02 16:43:23 -07:00
Eric House
a349ab4bee add commented-out getClassName() in case it's useful in the future. 2015-08-02 16:41:28 -07:00
Eric House
b3ca4ee223 fix off-by-one error that probably had me slowly leaking local obj
references for the last few years.
2015-08-02 16:29:53 -07:00
Eric House
56082d2f7b fix variant crashes: had forgotten PKG_PATH on new method 2015-08-02 16:15:32 -07:00
Eric House
a26e642c8e Problem: NBS port is being ignored by dispatcher to broadcast
receivers on receiving device, so variants are getting their own and
all other NBS messages. Solution: change protocol to include port
message is meant for so mis-delivered ones can be dropped.
2015-08-02 14:35:05 -07:00
Eric House
1fb55c8a78 move last-pressed button to bottom of screen where it's natural to look for it 2015-08-02 14:14:19 -07:00
Eric House
af8c6d618d different logging TAG for different variants 2015-08-02 10:29:17 -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
8aef67dba4 fix NPE reported by crittercism 2015-08-01 22:17:13 -07:00
Eric House
6c863155ef clean up BT UUID assignment, replacing runtime strcmp with compile
time macro magic
2015-07-31 07:35:44 -07:00
Eric House
36adf7f86c get rid of About menuitem in board -- in main view is enough 2015-07-31 07:14:04 -07:00
Eric House
d9bc713b7b get rid of About menuitem in board -- in main view is enough 2015-07-31 07:12:27 -07:00
Eric House
f45cafad29 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-07-31 07:05:39 -07:00