[Android] Avoid erratic scrolling on submit

source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/BaseActionElementRenderer.java

@@ -332,10 +332,6 @@ else if (m_action.GetElementType() == ActionType.ToggleVisibility)
             {
                 if (m_action.GetElementType() == ActionType.Submit || m_renderedAdaptiveCard.isActionSubmitable(view))
                 {
-                    // If an input is in focus before submit, and the same input is focused on error,
-                    // the input would not be scrolled into view. Instead, clearing focus first ensures scroll.
-                    Util.clearFocus(view);
-
                     if (!m_renderedAdaptiveCard.areInputsValid(Util.getViewId(view)))
                     {
                         return;

source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/Util.java

@@ -72,20 +72,17 @@ public static byte[] getBytes(CharVector charVector)
     }
 
     /**
-     * Clear any existing focus by temporarily adding then removing focus to a given helper View.
-     * @param v The helper View that will temporarily grab and release focus.
+     * Force focus when requestFocus is not sufficient.
+     * @param v The target View to focus
      */
-    public static void clearFocus(View v) {
-        boolean focusable = v.isFocusable();
+    public static void forceFocus(View v) {
         boolean focusableInTouchMode = v.isFocusableInTouchMode();
 
         v.setFocusable(true);
         v.setFocusableInTouchMode(true);
 
         v.requestFocusFromTouch();
-        v.clearFocus();
 
-        v.setFocusable(focusable);
         v.setFocusableInTouchMode(focusableInTouchMode);
     }
 

source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/CheckBoxSetInputHandler.java

@@ -9,6 +9,7 @@
 import io.adaptivecards.objectmodel.BaseInputElement;
 import io.adaptivecards.objectmodel.ChoiceInputVector;
 import io.adaptivecards.objectmodel.ChoiceSetInput;
+import io.adaptivecards.renderer.Util;
 
 import java.util.Arrays;
 import java.util.List;
@@ -77,8 +78,7 @@ public void setFocusToView()
     {
         if (m_checkBoxList.size() > 0)
         {
-            m_checkBoxList.get(0).setFocusableInTouchMode(true);
-            m_checkBoxList.get(0).requestFocus();
+            Util.forceFocus(m_checkBoxList.get(0));
             m_checkBoxList.get(0).sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED);
         }
     }

source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/ComboBoxInputHandler.java

@@ -10,6 +10,7 @@
 import io.adaptivecards.objectmodel.ChoiceInput;
 import io.adaptivecards.objectmodel.ChoiceInputVector;
 import io.adaptivecards.objectmodel.ChoiceSetInput;
+import io.adaptivecards.renderer.Util;
 import io.adaptivecards.renderer.input.customcontrols.ValidatedSpinnerLayout;
 
 import java.text.ParseException;
@@ -68,7 +69,7 @@ public void setInput(String value)
     @Override
     public void setFocusToView()
     {
-        m_view.requestFocus();
+        Util.forceFocus(m_view);
         m_view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED);
     }
 }

source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/RadioGroupInputHandler.java

@@ -10,6 +10,7 @@
 import io.adaptivecards.objectmodel.ChoiceInput;
 import io.adaptivecards.objectmodel.ChoiceInputVector;
 import io.adaptivecards.objectmodel.ChoiceSetInput;
+import io.adaptivecards.renderer.Util;
 
 import java.text.ParseException;
 import java.util.Map;
@@ -80,8 +81,7 @@ public void setFocusToView()
         {
             RadioButton radioButton = (RadioButton)(radioGroup.getChildAt(0));
 
-            radioButton.setFocusableInTouchMode(true);
-            radioButton.requestFocus();
+            Util.forceFocus(radioButton);
             radioButton.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED);
         }
     }

source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/TextInputHandler.java

@@ -66,7 +66,7 @@ public boolean isValidOnSpecifics(String textInputValue)
 
     public void setFocusToView()
     {
-        m_view.requestFocus();
+        Util.forceFocus(m_view);
         m_view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED);
     }
 }

source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/inputhandler/ToggleInputHandler.java

@@ -7,6 +7,7 @@
 
 import io.adaptivecards.objectmodel.BaseInputElement;
 import io.adaptivecards.objectmodel.ToggleInput;
+import io.adaptivecards.renderer.Util;
 
 import java.text.ParseException;
 import java.util.Map;
@@ -59,8 +60,7 @@ public boolean isValid()
     @Override
     public void setFocusToView()
     {
-        m_view.setFocusableInTouchMode(true);
-        m_view.requestFocus();
+        Util.forceFocus(m_view);
         m_view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED);
     }
 }

source/android/mobile/src/main/java/io/adaptivecards/adaptivecardssample/CustomObjects/CardElements/CustomInput.java

@@ -71,7 +71,7 @@ public void setInput(String input)
         @Override
         public void setFocusToView()
         {
-            m_view.requestFocus();
+            m_view.requestFocusFromTouch();
             m_view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED);
         }
     }