[Android] Refocus when a show card changes visibility (microsoft#1651)

* Refocus on show card * Set focus for cards instead of input fields
ismanapa · Jun 27, 2018 · f2a899a · f2a899a
1 parent b084d70
commit f2a899a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/...e/android/adaptivecards/src/main/java/io/adaptivecards/renderer/AdaptiveCardRenderer.java b/...e/android/adaptivecards/src/main/java/io/adaptivecards/renderer/AdaptiveCardRenderer.java
@@ -116,6 +116,8 @@ public View internalRender(RenderedAdaptiveCard renderedCard,
         LinearLayout rootLayout = new LinearLayout(context);
         rootLayout.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         rootLayout.setOrientation(LinearLayout.VERTICAL);
+        rootLayout.setFocusable(true);
+        rootLayout.setFocusableInTouchMode(true);
 
         LinearLayout layout = new LinearLayout(context);
         layout.setTag(adaptiveCard);

diff --git a/...d/adaptivecards/src/main/java/io/adaptivecards/renderer/action/ActionElementRenderer.java b/...d/adaptivecards/src/main/java/io/adaptivecards/renderer/action/ActionElementRenderer.java
@@ -1,5 +1,6 @@
 package io.adaptivecards.renderer.action;
 
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Paint;
@@ -111,6 +112,14 @@ public ShowCardInlineClickListener(View invisibleCard, ViewGroup hiddenCardsLayo
         @Override
         public void onClick(View v)
         {
+            Activity hostingActivity = (Activity)v.getContext();
+
+            View currentFocusedView = hostingActivity.getCurrentFocus();
+            if (currentFocusedView != null)
+            {
+                currentFocusedView.clearFocus();
+            }
+
             v.setPressed(m_invisibleCard.getVisibility() != View.VISIBLE);
             for(int i = 0; i < m_hiddenCardsLayout.getChildCount(); ++i)
             {
@@ -130,6 +139,7 @@ public void onClick(View v)
             if (m_invisibleCard.getVisibility() == View.VISIBLE)
             {
                 mainCardView.setPadding(padding, padding, padding, 0);
+                m_invisibleCard.requestFocus();
             }
             else
             {