From 430750e23a7abc5d8fe3a5f4dd6ca006f3cb2a67 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 25 Mar 2021 12:09:35 -0700
Subject: [PATCH] Change text for blank-out-filter-config Clear, not Reset

Reset somehow makes me expect the filter to be re-applied after the
inputs are removed.
---
 .../java/org/eehouse/android/xw4/DictBrowseDelegate.java    | 6 +++---
 xwords4/android/app/src/main/res/layout/dict_browser.xml    | 4 ++--
 xwords4/android/app/src/main/res/values/strings.xml         | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
index f3b9f625b..a3c1648c2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
@@ -275,7 +275,7 @@ public class DictBrowseDelegate extends DelegateBase
             m_desc = XwJNI.dict_getDesc( m_dict );
 
             int[] ids = { R.id.button_useconfig, R.id.button_addBlank,
-                          R.id.button_reset, };
+                          R.id.button_clear, };
             for ( int id : ids ) {
                 findViewById( id ).setOnClickListener(this);
             }
@@ -430,7 +430,7 @@ public class DictBrowseDelegate extends DelegateBase
         case R.id.button_addBlank:
             addBlankButtonClicked();
             break;
-        case R.id.button_reset:
+        case R.id.button_clear:
             resetClicked();
             break;
         default:
@@ -843,7 +843,7 @@ public class DictBrowseDelegate extends DelegateBase
             mResetChecker = null;
         } else if ( null == mResetChecker ) {
             final Handler handler = new Handler();
-            final Button resetButton = (Button)findViewById(R.id.button_reset);
+            final Button resetButton = (Button)findViewById(R.id.button_clear);
             mResetChecker = new Runnable() {
                     @Override
                     public void run() {
diff --git a/xwords4/android/app/src/main/res/layout/dict_browser.xml b/xwords4/android/app/src/main/res/layout/dict_browser.xml
index e727a32b4..51520616f 100644
--- a/xwords4/android/app/src/main/res/layout/dict_browser.xml
+++ b/xwords4/android/app/src/main/res/layout/dict_browser.xml
@@ -119,10 +119,10 @@
                   android:text="@string/button_addBlank"
                   android:enabled="false"
                   />
-          <Button android:id="@+id/button_reset"
+          <Button android:id="@+id/button_clear"
                   android:layout_height="wrap_content"
                   android:layout_width="wrap_content"
-                  android:text="@string/button_reset"
+                  android:text="@string/button_clear"
                   android:enabled="false"
                   />
         </LinearLayout>
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index efd637c0f..cd2acbf07 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -1567,6 +1567,8 @@
     <string name="button_useconfig">Apply Filter</string>
     <!-- Button in wordlist filter: keep it short!!!! -->
     <string name="button_addBlank">+Blank</string>
+    <!-- Button to clear wordlist filter config (but not re-apply the filter) -->
+    <string name="button_clear">Clear</string>
     <!-- String showing user what filter is in use. Substitutions are
          1) the filter pattern, 2) minimum and 3) maximum lengths, and
          4) number of words in the filtered list. -->