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
..
about_dlg.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
board.xml	use a single toolbar layout inflated from its own xml rather than	2014-07-22 19:38:32 -07:00
btinviter.xml	replace scan that tries to connect to all paired devices, taking 20	2014-09-25 06:40:44 -07:00
btinviter_item.xml	add ability to invite more than one player per device. This is mostly	2014-12-31 06:54:31 -08:00
chat.xml	store and present chat sender's name instead of the lame "Me"/"Not me"	2016-03-06 07:03:54 -08:00
chat_row.xml	stack-overflow config wierdness to fix long chat lines not	2016-03-08 07:20:40 -08:00
color_display.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
color_edit.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
confirm_sms.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
conn_types_display.xml	add newbie hints to checkboxes enabling communication types (bt, sms,	2015-06-25 06:38:40 -07:00
dflt_name.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
dict_browse.xml	make downloadable checkbox bigger and easier to hit	2014-06-22 12:00:30 -07:00
dict_browser.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
divider_view.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
expander_header.xml	add new class that's a header-styled label with an expander, and use	2014-09-08 07:30:07 -07:00
force_remote.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
fragact.xml	snapshot: tons of changes toward dual-pane. Board opening is about	2014-08-01 06:39:09 -07:00
game_config.xml	change default to checked so code doesn't have to set it	2015-10-29 06:32:18 -07:00
game_list.xml	use a style for new game buttons	2014-11-20 19:12:56 -08:00
game_list_group.xml	use a style for elements common to group headers	2014-07-11 21:38:17 -07:00
game_list_item.xml	force all comms-type icons to have same width	2014-09-08 08:02:12 -07:00
import_dict.xml	Support download of multiple dicts at once. (Download of apps not tested and may be broken. Next...)	2014-06-05 06:05:23 -07:00
import_dict_item.xml	Support download of multiple dicts at once. (Download of apps not tested and may be broken. Next...)	2014-06-05 06:05:23 -07:00
list_group.xml	use a style for elements common to group headers	2014-07-11 21:38:17 -07:00
list_item.xml	revert list item change (but keep the padding)	2014-10-01 06:06:47 -07:00
loc_item_edit.xml	add separate activity/delegate for editing translations, launched by	2014-05-13 21:07:56 -07:00
loc_list_item.xml	toward adding default menu to all activities and eventually tracking	2014-05-12 21:26:31 -07:00
loc_main.xml	provide default default language name (and rename string constant	2015-01-23 08:35:04 -08:00
lookup.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
main.xml	snapshot: tons of changes toward dual-pane. Board opening is about	2014-08-01 06:39:09 -07:00
msg_label_and_edit.xml	add a bit of space to the custom view	2015-02-12 21:12:28 -08:00
not_again_view.xml	inset checkbox for better visibility	2015-01-27 08:24:06 -08:00
passwd_view.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
player_edit.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
player_list_elem.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
prefs_w_buttons.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
relayinviter.xml	remove buttons I'm not using, and put the final action button at the bottom	2015-10-15 06:46:53 -07:00
remote_dict_details.xml	emphasize button by centering it rather than making it green, since	2015-02-04 07:21:17 -08:00
rename_game.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
smsinviter.xml	remove padding	2016-01-07 08:07:17 -08:00
smsinviter_item.xml	Add UI to invite via SMS more than one player per device (if the	2015-01-23 08:19:20 -08:00
studylist.xml	Because loc: strings can't be supplied for all Views, don't do	2014-04-09 21:09:46 -07:00
toolbar.xml	use a single toolbar layout inflated from its own xml rather than	2014-07-22 19:38:32 -07:00