Merge pull request #401 from rivaldi8/fix-standard-kb-on-edit

Avoid opening the standard keyboard in amount edit text when editing
codinguser · Oct 8, 2015 · 5cbac10 · 5cbac10
2 parents dbed8af + d50bc58
commit 5cbac10
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/app/src/main/java/org/gnucash/android/ui/transaction/TransactionFormFragment.java b/app/src/main/java/org/gnucash/android/ui/transaction/TransactionFormFragment.java
@@ -505,8 +505,7 @@ private void setAmountEditViewVisible(int visibility) {
     private void toggleAmountInputEntryMode(boolean enabled){
         if (enabled){
             mAmountEditText.setFocusable(true);
-            mAmountEditText.setOnClickListener(null);
-            mAmountEditText.setDefaultTouchListener();
+            mAmountEditText.bindListeners(mKeyboardView);
         } else {
             mAmountEditText.setFocusable(false);
             mAmountEditText.setOnClickListener(new View.OnClickListener() {
@@ -515,7 +514,6 @@ public void onClick(View v) {
                     openSplitEditor();
                 }
             });
-            mAmountEditText.setOnTouchListener(null);
         }
     }
 

diff --git a/app/src/main/java/org/gnucash/android/ui/util/widget/CalculatorEditText.java b/app/src/main/java/org/gnucash/android/ui/util/widget/CalculatorEditText.java
@@ -158,27 +158,21 @@ public boolean onLongClick(View v) {
             }
         });
 
-        setDefaultTouchListener();
-
-        ((FormActivity)mContext).setOnBackListener(mCalculatorKeyboard);
-    }
-
-    /**
-     * Sets the default touch listener which opens the calculator keyboard
-     */
-    public void setDefaultTouchListener() {
+        // Although it looks redundant having both onClickListener and OnTouchListener, removing
+        // one of them makes the standard keyboard show up in addition to the calculator one.
         setOnTouchListener(new OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
                 if (!mCalculatorKeyboard.isCustomKeyboardVisible())
                     mCalculatorKeyboard.showCustomKeyboard(v);
 
-
                 // XXX: Use dispatchTouchEvent()?
-                onTouchEvent(event);               // Call native handler
+                onTouchEvent(event);
                 return false;
             }
         });
+
+        ((FormActivity)mContext).setOnBackListener(mCalculatorKeyboard);
     }
 
     /**