diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java index e4a17caa9..0d904354f 100644 --- a/xwords4/android/XWords4/archive/R.java +++ b/xwords4/android/XWords4/archive/R.java @@ -353,8 +353,8 @@ public final class R { /** Another paragraph in the about dialog */ public static final int about_web=0x7f0501da; - public static final int add_done_fmt=0x7f05028b; - public static final int add_to_study_fmt=0x7f050283; + public static final int add_done_fmt=0x7f05028a; + public static final int add_to_study_fmt=0x7f050282; /** Debugging stuff. No point in localizing it. */ public static final int advanced=0x7f050078; @@ -368,7 +368,7 @@ public final class R { /** The name of the app. Not localized! */ public static final int app_name=0x7f050001; - public static final int app_not_found_fmt=0x7f0502c7; + public static final int app_not_found_fmt=0x7f0502c6; public static final int app_version=0x7f050000; /** the background color of the area outside the board, e.g. between entries in the scoreboard @@ -500,14 +500,14 @@ public final class R { /** */ public static final int bt_bad_proto_fmt=0x7f05020a; - public static final int bt_err_count_fmt=0x7f0502c5; + public static final int bt_err_count_fmt=0x7f0502c4; /** */ public static final int bt_fail_fmt=0x7f05020f; /** Title of device picker during invitation to a game via Bluetooth */ public static final int bt_invite_title=0x7f050211; - public static final int bt_no_devs=0x7f0502c6; + public static final int bt_no_devs=0x7f0502c5; /** Turn Bluetooth on In the Bluetooth invite device dialog */ @@ -785,7 +785,7 @@ public final class R { /** */ public static final int confirm_sms_willpay=0x7f050244; - public static final int confirm_studylist_clear_fmt=0x7f050289; + public static final int confirm_studylist_clear_fmt=0x7f050288; /** text of dialog shown when the menu item board_menu_undo_last is chosen. */ @@ -819,7 +819,7 @@ public final class R { public static final int connect_one_hour=0x7f050175; public static final int connect_six_hours=0x7f050176; public static final int connect_thirty_mins=0x7f050174; - public static final int connection_via_label=0x7f0502d4; + public static final int connection_via_label=0x7f0502d3; /** */ public static final int connstat_lastother_succ_fmt=0x7f050237; @@ -863,7 +863,7 @@ public final class R { /** */ public static final int cur_tiles_fmt=0x7f0501f0; - public static final int data_gsm_only=0x7f05029b; + public static final int data_gsm_only=0x7f05029a; public static final int debug_features=0x7f05007f; public static final int debug_features_summary=0x7f050080; /** dictionary used by default for human players when creating @@ -875,7 +875,7 @@ public final class R { public static final int default_host=0x7f05006c; /** label within default wordlists in app preferences */ - public static final int default_language=0x7f0502c8; + public static final int default_language=0x7f0502c7; public static final int default_loc=0x7f05025b; public static final int default_loc_summary=0x7f05025c; /** Welcome dialog text @@ -905,7 +905,7 @@ public final class R { */ public static final int default_robodict=0x7f05013b; public static final int default_update_url=0x7f050076; - public static final int delete_dicts=0x7f0502ad; + public static final int delete_dicts=0x7f0502ac; /** */ public static final int dft_name_fmt=0x7f050217; @@ -925,14 +925,14 @@ public final class R { */ public static final int dict_browse_title_fmt=0x7f0501f2; public static final int dict_host=0x7f05007c; - public static final int dict_info_fmt=0x7f0502b1; + public static final int dict_info_fmt=0x7f0502b0; /** label for dropdown by which wordlist is chosen that this player will use. The language the game will use (which constrains the choice of wordlists) is substituted in for "%1$s". */ public static final int dict_lang_label_fmt=0x7f0500e8; - public static final int dict_on_server=0x7f0502b3; + public static final int dict_on_server=0x7f0502b2; /** string name="invite_mime">text/plainSend invitation using SMS (texting) or via email? Send invitation using NFC (Android @@ -1442,9 +1442,9 @@ public final class R { different wordlists.) */ public static final int lang_label=0x7f0500c7; - public static final int lang_name_english=0x7f0502a2; - public static final int lang_name_fmt=0x7f0502b4; - public static final int lang_unknown=0x7f0502b5; + public static final int lang_name_english=0x7f0502a1; + public static final int lang_name_fmt=0x7f0502b3; + public static final int lang_unknown=0x7f0502b4; public static final int langdict_label=0x7f0500c8; public static final int list_group_default=0x7f050261; public static final int list_group_delete=0x7f05025f; @@ -1479,13 +1479,13 @@ public final class R { except for any configuration. */ public static final int list_item_reset=0x7f0500a8; - public static final int lmi_move_fmt=0x7f0502c1; + public static final int lmi_move_fmt=0x7f0502c0; /** formatting for last move summary in notifications */ - public static final int lmi_pass_fmt=0x7f0502c0; - public static final int lmi_phony_fmt=0x7f0502c3; - public static final int lmi_tiles_fmt=0x7f0502c4; - public static final int lmi_trade_fmt=0x7f0502c2; + public static final int lmi_pass_fmt=0x7f0502bf; + public static final int lmi_phony_fmt=0x7f0502c2; + public static final int lmi_tiles_fmt=0x7f0502c3; + public static final int lmi_trade_fmt=0x7f0502c1; /** One of the strings used in the right column of the list of installed wordlists to describe those that are part of Crosswords and that cannot be uninstalled or moved. @@ -1503,32 +1503,32 @@ public final class R { /** */ public static final int loc_external=0x7f0500be; - public static final int loc_filters_all=0x7f05029e; - public static final int loc_filters_menu=0x7f0502a0; - public static final int loc_filters_modified=0x7f0502a1; - public static final int loc_filters_prompt=0x7f05029c; - public static final int loc_filters_screen=0x7f05029f; - public static final int loc_fmts_mismatch=0x7f0502a7; + public static final int loc_filters_all=0x7f05029d; + public static final int loc_filters_menu=0x7f05029f; + public static final int loc_filters_modified=0x7f0502a0; + public static final int loc_filters_prompt=0x7f05029b; + public static final int loc_filters_screen=0x7f05029e; + public static final int loc_fmts_mismatch=0x7f0502a6; /** see move_dictf above */ public static final int loc_internal=0x7f0500bd; - public static final int loc_item_check=0x7f0502a4; + public static final int loc_item_check=0x7f0502a3; /** for loc item edit menu */ - public static final int loc_item_clear=0x7f0502a3; - public static final int loc_item_copy_bless=0x7f0502a6; - public static final int loc_item_copy_eng=0x7f0502a5; - public static final int loc_lang_blessed=0x7f050296; - public static final int loc_lang_local=0x7f050297; - public static final int loc_menu_xlate=0x7f050295; - public static final int loc_search_prompt=0x7f05029d; + public static final int loc_item_clear=0x7f0502a2; + public static final int loc_item_copy_bless=0x7f0502a5; + public static final int loc_item_copy_eng=0x7f0502a4; + public static final int loc_lang_blessed=0x7f050295; + public static final int loc_lang_local=0x7f050296; + public static final int loc_menu_xlate=0x7f050294; + public static final int loc_search_prompt=0x7f05029c; /** This is the "hint" printed in light text in the empty player name field */ public static final int local_name_hint=0x7f050194; public static final int logging_on=0x7f05007d; public static final int logging_on_summary=0x7f05007e; - public static final int lookup_title=0x7f050291; + public static final int lookup_title=0x7f050290; /** */ public static final int manual_owner_name=0x7f05021e; @@ -1553,7 +1553,7 @@ public final class R { /** text of menu that brings up the Settings (preferences) dialog */ public static final int menu_prefs=0x7f05009e; - public static final int menu_rateme=0x7f050281; + public static final int menu_rateme=0x7f050280; /** */ public static final int menu_toggle_values=0x7f05022f; @@ -1641,22 +1641,22 @@ public final class R { /** Text of progress indicator shown while check is being conducted */ public static final int msgs_progress=0x7f0500a0; - public static final int nag_body_fmt=0x7f0502bd; - public static final int nag_days_fmt=0x7f0502bc; - public static final int nag_hours_fmt=0x7f0502bb; + public static final int nag_body_fmt=0x7f0502bc; + public static final int nag_days_fmt=0x7f0502bb; + public static final int nag_hours_fmt=0x7f0502ba; public static final int nag_intervals=0x7f05008e; /** body of warning notification reminder message. First three are used to build a string based on the length of time that's then inserted in the fourth. E.g "PlayerName moved more than 2 day[s], 4 hour[s] ago." */ - public static final int nag_minutes_fmt=0x7f0502ba; + public static final int nag_minutes_fmt=0x7f0502b9; /** Nagging: title of notification reminder message */ - public static final int nag_title=0x7f0502b9; + public static final int nag_title=0x7f0502b8; /** above is inserted in this the last time I warn */ - public static final int nag_warn_last_fmt=0x7f0502be; + public static final int nag_warn_last_fmt=0x7f0502bd; public static final int name_dict_fmt=0x7f050088; public static final int nbs_port=0x7f050077; /** text of checkbox. If this checkbox is checked, games created @@ -1695,10 +1695,10 @@ public final class R { /** */ public static final int new_dict_avail_fmt=0x7f050249; - public static final int new_game=0x7f0502ca; - public static final int new_game_message=0x7f0502cc; - public static final int new_game_message_net=0x7f0502cd; - public static final int new_game_networked=0x7f0502cb; + public static final int new_game=0x7f0502c9; + public static final int new_game_message=0x7f0502cb; + public static final int new_game_message_net=0x7f0502cc; + public static final int new_game_networked=0x7f0502ca; /** */ public static final int new_move_body=0x7f05020c; @@ -1711,7 +1711,7 @@ public final class R { /** */ public static final int new_sms_title=0x7f05021a; - public static final int new_xlations_fmt=0x7f050298; + public static final int new_xlations_fmt=0x7f050297; /** ########################################################### # :Dialogs: @@ -1777,7 +1777,7 @@ public final class R { */ public static final int newgame_sms_header=0x7f050218; public static final int newgroup_label=0x7f05025e; - public static final int nfc_just_tap=0x7f0502d8; + public static final int nfc_just_tap=0x7f0502d7; /** Title of dialog for renaming game (triggered by selecting list_item_rename) If you try to copy a networked game you get this error @@ -1823,8 +1823,7 @@ public final class R { you get this error message */ public static final int no_games_to_refresh=0x7f0500a1; - public static final int no_hide_titlebar=0x7f05027e; - public static final int no_market=0x7f050282; + public static final int no_market=0x7f050281; /** displayed when you long-tap a scoreboard entry and there's no most recent score to show */ @@ -1875,7 +1874,7 @@ public final class R { for games with more than two devices, which are rare. */ public static final int not_again_conndmid=0x7f0501d1; - public static final int not_again_dicts=0x7f0502b6; + public static final int not_again_dicts=0x7f0502b5; /** This is shown when you choose the board_menu_done menu item. It's to let you know that there's a shortcut that does almost the same thing. @@ -1885,8 +1884,8 @@ public final class R { Board screen */ public static final int not_again_flip=0x7f0501c9; - public static final int not_again_fmt_expl=0x7f0502a8; - public static final int not_again_hidenewgamebuttons=0x7f0502d6; + public static final int not_again_fmt_expl=0x7f0502a7; + public static final int not_again_hidenewgamebuttons=0x7f0502d5; /** Shown when you tap the next hint button on the toolbar of the main Board screen */ @@ -1911,7 +1910,7 @@ public final class R { */ public static final int not_again_newfrom=0x7f0501d5; public static final int not_again_newselect=0x7f050273; - public static final int not_again_studycopy=0x7f050290; + public static final int not_again_studycopy=0x7f05028f; /** The following strings (all whose names start with "not_again") appear in the New user info dialog. @@ -1946,7 +1945,7 @@ public final class R { the main Board screen */ public static final int not_again_zoom=0x7f0501ca; - public static final int note_none=0x7f0502b2; + public static final int note_none=0x7f0502b1; /** This text is displayed as the "summary" for both of the notify choices above, as extra information. (There could be different strings if it makes more sense in your language.) @@ -1967,8 +1966,8 @@ public final class R { device */ public static final int notify_vibrate=0x7f050179; - public static final int nplayers_fmt=0x7f0502d0; - public static final int nplayers_prompt=0x7f0502cf; + public static final int nplayers_fmt=0x7f0502cf; + public static final int nplayers_prompt=0x7f0502ce; /** text of label identifying the field where human players can enter an option password. The label and field disappear when the robot player checkbox is checked because it makes no @@ -1978,13 +1977,13 @@ public final class R { games as well. */ public static final int password_label=0x7f0500eb; - public static final int paste_done_fmt=0x7f05028a; + public static final int paste_done_fmt=0x7f050289; /** You have NFC enabled. That means that any time a board that\'s missing a player is open, you can tap a nearby person\'s device to invite him/her to play – if he/she is also using NFC. */ - public static final int pct_suffix=0x7f050280; + public static final int pct_suffix=0x7f05027f; /** If this preference is checked, tapping on the scoreboard entry for any player reveals that player's tiles and any pending move (after asking for his password if one is set.) @@ -2141,8 +2140,8 @@ public final class R { public static final int prefs_names_summary=0x7f050131; /** Used when prev player's name can't be looked up */ - public static final int prev_player=0x7f0502bf; - public static final int progress_title=0x7f0502b0; + public static final int prev_player=0x7f0502be; + public static final int progress_title=0x7f0502af; /** */ public static final int prompt_max_len=0x7f0501fb; @@ -2193,14 +2192,14 @@ public final class R { /** Shown in toast when relaunching after switching dicts */ public static final int reload_new_dict_fmt=0x7f050252; - public static final int remote_digesting=0x7f0502aa; - public static final int remote_empty=0x7f0502a9; + public static final int remote_digesting=0x7f0502a9; + public static final int remote_empty=0x7f0502a8; /** checkbox determining of this player is on this device or remote. If remote, then the rest of the fields disappear (since they will be set by the remote device.) */ public static final int remote_label=0x7f0500e6; - public static final int remote_no_net=0x7f0502ab; + public static final int remote_no_net=0x7f0502aa; /** */ public static final int remote_undone=0x7f050227; @@ -2243,7 +2242,7 @@ public final class R { public static final int room_public_prompt=0x7f0500cd; public static final int sel_games_fmt=0x7f050275; public static final int sel_groups_fmt=0x7f050276; - public static final int sel_items_fmt=0x7f050294; + public static final int sel_items_fmt=0x7f050293; /** ############################################################ # :Dialogs: @@ -2255,7 +2254,7 @@ public final class R { possible answers are the three button text strings below. */ public static final int set_default_message_fmt=0x7f0500b8; - public static final int set_pref=0x7f0502d5; + public static final int set_pref=0x7f0502d4; /** text of separator marking out other-setting area of the dialog */ public static final int settings_label=0x7f0500d0; @@ -2267,7 +2266,7 @@ public final class R { /** clarification of above */ public static final int show_arrow_summary=0x7f05014f; - public static final int show_remote=0x7f0502ae; + public static final int show_remote=0x7f0502ad; public static final int show_wordlist_browser=0x7f050271; /** If this preference is checked, the user will not be asked to confirm after selecting the "Turn done" menu (or tapping the @@ -2277,14 +2276,14 @@ public final class R { /** explanation of the above */ public static final int skip_confirm_turn_summary=0x7f050165; - public static final int slmenu_clear_sel=0x7f050288; - public static final int slmenu_copy_sel=0x7f050287; - public static final int slmenu_deselect_all=0x7f050293; - public static final int slmenu_select_all=0x7f050292; + public static final int slmenu_clear_sel=0x7f050287; + public static final int slmenu_copy_sel=0x7f050286; + public static final int slmenu_deselect_all=0x7f050292; + public static final int slmenu_select_all=0x7f050291; /** Title of phone number picker during invitation to a game via SMS */ public static final int sms_invite_title=0x7f050212; - public static final int sms_ready_text=0x7f05027f; + public static final int sms_ready_text=0x7f05027e; /** */ public static final int smsname_label=0x7f050214; @@ -2457,10 +2456,10 @@ public final class R { /** Used in formatting exchange move summaries */ public static final int strss_traded_for_fmt=0x7f05011f; - public static final int study_langpick=0x7f05028d; - public static final int study_no_lang_fmt=0x7f05028e; - public static final int study_no_lists=0x7f05028f; - public static final int studylist_title_fmt=0x7f05028c; + public static final int study_langpick=0x7f05028c; + public static final int study_no_lang_fmt=0x7f05028d; + public static final int study_no_lists=0x7f05028e; + public static final int studylist_title_fmt=0x7f05028b; /** If substituting an existing same-language wordlist by choosing button_substdict user gets to choose from a list of wordlists. This is the title of that list. @@ -2510,7 +2509,7 @@ public final class R { /** explanation of the above */ public static final int summary_sort_tiles=0x7f050167; - public static final int summary_studyon=0x7f050285; + public static final int summary_studyon=0x7f050284; public static final int summary_thumbsize=0x7f050277; /** */ @@ -2541,7 +2540,7 @@ public final class R { /** Title of preference in which you select which addressing modes network games will use to communicate */ - public static final int title_addrs_pref=0x7f0502c9; + public static final int title_addrs_pref=0x7f0502c8; /** ############################################################ # :Screens: @@ -2591,13 +2590,13 @@ public final class R { i.e. after ever move. */ public static final int title_sort_tiles=0x7f050166; - public static final int title_studyon=0x7f050284; + public static final int title_studyon=0x7f050283; /** title of dialog allowing user to pick tiles "face up". (This feature is not yet supported on Android.) */ public static final int title_tile_picker=0x7f0501b9; - public static final int update_dicts_fmt=0x7f0502af; - public static final int use_defaults=0x7f0502ce; + public static final int update_dicts_fmt=0x7f0502ae; + public static final int use_defaults=0x7f0502cd; /** text of checkbox controlling whether there's a game timer */ public static final int use_timer=0x7f0500d3; @@ -2617,8 +2616,8 @@ public final class R { /** */ public static final int word_search_hint=0x7f0501ed; - public static final int xlations_enabled_summary=0x7f05029a; - public static final int xlations_enabled_title=0x7f050299; + public static final int xlations_enabled_summary=0x7f050299; + public static final int xlations_enabled_title=0x7f050298; public static final int xlations_locale=0x7f05008c; /** Empty in English, this should contain the name of the translator/creator of the strings.xml file for this diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index 5bdbe638d..2c4f8bbed 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -2107,9 +2107,6 @@ Launch Settings - This setting is ignored on devices - like yours that depend on the \"Action bar.\" - Tap the receiving device now diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml index 09e6ab039..68c3b9c5c 100644 --- a/xwords4/android/XWords4/res/xml/xwprefs.xml +++ b/xwords4/android/XWords4/res/xml/xwprefs.xml @@ -99,6 +99,7 @@ diff --git a/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml b/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml index 76ae83013..84c19baa1 100644 --- a/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml @@ -1804,8 +1804,6 @@ CFN si denrut ffo no siht ecived. Uoy nac esu eht Diordna Sgnittes ppa ot nrut ti no . Hcnual Sgnittes - Siht gnittes si derongi no secived - ekil sruoy taht dneped no eht \"Noitca rab.\" Pat eht gniviecer ecived won diff --git a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml index 6f95dbfcb..12e5e4016 100644 --- a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml @@ -1804,8 +1804,6 @@ NFC IS TURNED OFF ON THIS DEVICE. YOU CAN USE THE ANDROID SETTINGS APP TO TURN IT ON . LAUNCH SETTINGS - THIS SETTING IS IGNORED ON DEVICES - LIKE YOURS THAT DEPEND ON THE \"ACTION BAR.\" TAP THE RECEIVING DEVICE NOW diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgID.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgID.java index 9736d05e7..13b88090a 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgID.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgID.java @@ -36,7 +36,6 @@ public enum DlgID { , DLG_INVITE , DLG_OKONLY , ENABLE_NFC - , EXPLAIN_TITLE , FORCE_REMOTE , GAME_OVER , GET_NAME diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java index eb7dd987c..2c8fe8f66 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java @@ -47,7 +47,6 @@ public class PrefsDelegate extends DelegateBase private String m_smsEnable; private String m_downloadPath; private String m_thumbSize; - private String m_hideTitle; private String m_keyLocale; private String m_keyLangs; @@ -110,13 +109,6 @@ public class PrefsDelegate extends DelegateBase case CONFIRM_SMS: dialog = SMSCheckBoxPreference.onCreateDialog( m_activity, id ); break; - case EXPLAIN_TITLE: - dialog = makeAlertBuilder() - .setMessage( R.string.no_hide_titlebar ) - .setTitle( R.string.info_title ) - .setPositiveButton( R.string.button_ok, null ) - .create(); - break; } if ( null == dialog && null != lstnr ) { @@ -141,7 +133,6 @@ public class PrefsDelegate extends DelegateBase m_smsEnable = getString( R.string.key_enable_sms ); m_downloadPath = getString( R.string.key_download_path ); m_thumbSize = getString( R.string.key_thumbsize ); - m_hideTitle = getString( R.string.key_hide_title ); m_keyLocale = getString( R.string.key_xlations_locale ); m_keyLangs = getString( R.string.key_default_language ); @@ -207,14 +198,6 @@ public class PrefsDelegate extends DelegateBase DictUtils.invalDictList(); } else if ( key.equals( m_thumbSize ) ) { DBUtils.clearThumbnails( m_activity ); - } else if ( key.equals( m_hideTitle ) ) { - if ( sp.getBoolean( key, false ) && ABUtils.haveActionBar() ) { - CheckBoxPreference pref - = (CheckBoxPreference)m_activity.findPreference(key); - pref.setChecked( false ); - pref.setEnabled( false ); - showDialog( DlgID.EXPLAIN_TITLE ); - } } else if ( key.equals( m_keyLocale ) ) { LocUtils.localeChanged( m_activity, sp.getString( key, null ) ); } else if ( key.equals( m_keyLangs ) ) { @@ -265,15 +248,22 @@ public class PrefsDelegate extends DelegateBase } } + private void hideOne( int prefID, int screenID ) + { + Preference pref = m_activity.findPreference( getString( prefID ) ); + String key = getString( screenID ); + ((PreferenceScreen)m_activity.findPreference( key )) + .removePreference( pref ); + } + private void hideStuff() { if ( !XWApp.SMSSUPPORTED || !Utils.isGSMPhone( m_activity ) ) { - String key = getString( R.string.key_enable_sms ); - Preference pref = m_activity.findPreference( key ); - key = getString( R.string.key_network_behavior ); - PreferenceScreen screen = (PreferenceScreen) - m_activity.findPreference( key ); - screen.removePreference( pref ); + hideOne( R.string.key_enable_sms, R.string.key_network_behavior ); + } + + if ( ABUtils.haveActionBar() ) { + hideOne( R.string.key_hide_title, R.string.prefs_appearance ); } }