1 files changed, 12 insertions, 4 deletions
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/tv/TestStepBase.java b/apps/CtsVerifier/src/com/android/cts/verifier/tv/TestStepBase.java
index 6c9b5a10b79..9c117e4f2c6 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/tv/TestStepBase.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/tv/TestStepBase.java
@@ -16,6 +16,7 @@
 
 package com.android.cts.verifier.tv;
 
+import android.app.Activity;
 import android.view.View;
 import android.widget.TextView;
 
@@ -24,9 +25,12 @@ import com.android.cts.verifier.R;
 import com.google.common.truth.FailureStrategy;
 import com.google.common.truth.StandardSubjectBuilder;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /** Encapsulates the logic of a test step, which displays human instructions. */
 public abstract class TestStepBase {
-    protected final TvAppVerifierActivity mContext;
+    protected final Activity mContext;
 
     private boolean mHasPassed;
     private Runnable mOnDoneListener;
@@ -41,7 +45,7 @@ public abstract class TestStepBase {
      * @param context The test activity which this test step is part of.
      * @param instructionText The text of the test instruction visible to the user.
      */
-    public TestStepBase(TvAppVerifierActivity context, String instructionText) {
+    public TestStepBase(Activity context, String instructionText) {
         this.mContext = context;
 
         FailureStrategy failureStrategy =
@@ -59,8 +63,12 @@ public abstract class TestStepBase {
     }
 
     /** Creates the View for this test step in the context {@link TvAppVerifierActivity}. */
-    public void createUiElements() {
-        mInstructionView = mContext.createAutoItem(mInstructionText);
+    public List<View> createUiElements() {
+        mInstructionView = TvAppVerifierActivity
+                .createAutoItem(mContext.getLayoutInflater(), mInstructionText, null);
+        List<View> list = new ArrayList<>();
+        list.add(mInstructionView);
+        return list;
     }
 
     /** Enables interactivity for this test step - for example, it enables buttons. */