From 2fa9b9151ca9413d4a512b2c594ce6faa80bd5c1 Mon Sep 17 00:00:00 2001 From: Eric House Date: Fri, 13 Jun 2014 07:34:15 -0700 Subject: [PATCH] remove firefox warning and unused method --- xwords4/android/XWords4/archive/R.java | 93 +++++++++---------- .../android/XWords4/res/values/strings.xml | 5 - .../XWords4/res_src/values-ba_CK/strings.xml | 4 - .../XWords4/res_src/values-ca_PS/strings.xml | 4 - .../eehouse/android/xw4/DictsDelegate.java | 30 +----- 5 files changed, 48 insertions(+), 88 deletions(-) diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java index 1628b353f..2514d58ee 100644 --- a/xwords4/android/XWords4/archive/R.java +++ b/xwords4/android/XWords4/archive/R.java @@ -363,8 +363,8 @@ public final class R { /** Another paragraph in the about dialog */ public static final int about_web=0x7f0601e3; - public static final int add_done_fmt=0x7f06029a; - public static final int add_to_study_fmt=0x7f060292; + public static final int add_done_fmt=0x7f060299; + public static final int add_to_study_fmt=0x7f060291; /** Debugging stuff. No point in localizing it. */ public static final int advanced=0x7f060075; @@ -806,7 +806,7 @@ public final class R { /** */ public static final int confirm_sms_willpay=0x7f060250; - public static final int confirm_studylist_clear_fmt=0x7f060298; + public static final int confirm_studylist_clear_fmt=0x7f060297; /** text of dialog shown when the menu item board_menu_undo_last is chosen. */ @@ -886,7 +886,7 @@ public final class R { /** */ public static final int cur_tiles_fmt=0x7f0601f8; - public static final int data_gsm_only=0x7f0602aa; + public static final int data_gsm_only=0x7f0602a9; public static final int debug_features=0x7f06007c; public static final int debug_features_summary=0x7f06007d; /** dictionary used by default for human players when creating @@ -925,7 +925,7 @@ public final class R { */ public static final int default_robodict=0x7f06013d; public static final int default_update_url=0x7f060074; - public static final int delete_dicts=0x7f0602bb; + public static final int delete_dicts=0x7f0602ba; /** */ public static final int dft_name_fmt=0x7f06021e; @@ -942,14 +942,14 @@ public final class R { */ public static final int dict_browse_title_fmt=0x7f0601fa; public static final int dict_host=0x7f060079; - public static final int dict_installed=0x7f0602bc; + public static final int dict_installed=0x7f0602bb; /** 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=0x7f0600e8; - public static final int dict_needs_update=0x7f0602bd; + public static final int dict_needs_update=0x7f0602bc; /** string name="invite_mime">text/plain\u0020pct. - If Android gives you a choice of - browsers for viewing the wordlists downloads page, DO NOT choose - Firefox. Some versions have a bug that can cause the wordlists to - be lost. - Rate Crosswords Google Play app not found 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 1779bd497..0e7d9c21e 100644 --- a/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml @@ -1874,10 +1874,6 @@ nac pat a ybraen nosrep\'s ecived ot etivni reh/mih ot yalp – fi ehs/eh si osla gnisu CFN. \u0020tcp. - Fi Diordna sevig uoy a eciohc fo - sresworb rof gniweiv eht stsildrow sdaolnwod ,egap OD TON esoohc - Xoferif. Emos snoisrev evah a gub taht nac esuac eht stsildrow ot - eb tsol. Etar Sdrowssorc Elgoog Yalp ppa ton dnuof Dda %1$s ot tsilyduts 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 5ddc000ac..c87a7ff45 100644 --- a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml @@ -1874,10 +1874,6 @@ CAN TAP A NEARBY PERSON\'S DEVICE TO INVITE HIM/HER TO PLAY – IF HE/SHE IS ALSO USING NFC. \u0020PCT. - IF ANDROID GIVES YOU A CHOICE OF - BROWSERS FOR VIEWING THE WORDLISTS DOWNLOADS PAGE, DO NOT CHOOSE - FIREFOX. SOME VERSIONS HAVE A BUG THAT CAN CAUSE THE WORDLISTS TO - BE LOST. RATE CROSSWORDS GOOGLE PLAY APP NOT FOUND ADD %1$s TO STUDYLIST diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java index 0a648aa06..60f1dcad2 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java @@ -345,7 +345,6 @@ public class DictsDelegate extends ListDelegateBase MountEventReceiver.register( this ); mkListAdapter(); - expandGroups(); setTitleBar(); } @@ -532,7 +531,6 @@ public class DictsDelegate extends ListDelegateBase post( new Runnable() { public void run() { mkListAdapter(); - expandGroups(); } } ); } @@ -555,7 +553,7 @@ public class DictsDelegate extends ListDelegateBase } break; case DOWNLOAD_DICT_ACTION: - startDownload( (Intent)params[0] ); + startActivity( (Intent)params[0] ); break; default: Assert.fail(); @@ -573,24 +571,12 @@ public class DictsDelegate extends ListDelegateBase DictUtils.deleteDict( m_activity, dict, loc ); DictLangCache.inval( m_activity, dict, loc, false ); mkListAdapter(); - expandGroups(); } private void startDownload( int lang, String name ) { Intent intent = mkDownloadIntent( m_activity, lang, name ); - showNotAgainDlgThen( R.string.not_again_firefox, - R.string.key_na_firefox, - Action.DOWNLOAD_DICT_ACTION, intent ); - } - - private void startDownload( Intent downloadIntent ) - { - try { - startActivity( downloadIntent ); - } catch ( android.content.ActivityNotFoundException anfe ) { - showToast( R.string.no_download_warning ); - } + startActivity( intent ); } private void mkListAdapter() @@ -603,18 +589,6 @@ public class DictsDelegate extends ListDelegateBase m_selDicts = new HashMap(); } - private void expandGroups() - { - DbgUtils.logf( "expandGroups() not implemented" ); - // for ( int ii = 0; ii < m_langs.length; ++ii ) { - // boolean open = true; - // String lang = m_langs[ii]; - // if ( ! m_closedLangs.contains( lang ) ) { - // m_expView.expandGroup( ii ); - // } - // } - } - private void saveClosed() { String[] asArray = m_closedLangs.toArray( new String[m_closedLangs.size()] );