commit ab46229b057fb33e73a6214c781b3b9a0562d046
author Dake Gu <dake@google.com> Mon Jan 11 15:56:12 2016 -0800
committer Dake Gu <dake@google.com> Mon Jan 11 16:00:33 2016 -0800
tree 34ddaad7bd652ef48b60602919ffc9d10792c176
parent 47005bba6e07c4578530bd151967c0cce7daedc3

GuidedStepFragment: add test for icon

Bug 26473407

Change-Id: I2f59fe2d869c39c802a6451533a49f6682cdef8a

samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java

diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java
index cac3e846..11cc403 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java
@@ -104,12 +104,14 @@
                 .build());
     }
 
-    private static void addEditableAction(List<GuidedAction> actions, long id, String title, String desc) {
-        actions.add(new GuidedAction.Builder()
+    private static void addEditableAction(Context context, List<GuidedAction> actions,
+            long id, String title, String desc) {
+        actions.add(new GuidedAction.Builder(context)
                 .id(id)
                 .title(title)
                 .description(desc)
                 .editable(true)
+                .icon(R.drawable.lb_ic_search_mic)
                 .build());
     }
 
@@ -304,8 +306,8 @@
 
         @Override
         public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) {
-            addEditableAction(actions, FIRST_NAME, "Pat", "Your first name");
-            addEditableAction(actions, LAST_NAME, "Smith", "Your last name");
+            addEditableAction(getContext(), actions, FIRST_NAME, "Pat", "Your first name");
+            addEditableAction(getContext(), actions, LAST_NAME, "Smith", "Your last name");
             List<GuidedAction> subActions = new ArrayList<GuidedAction>();
             addAction(actions, PAYMENT, "Select Payment", "", subActions);
             addEditableDescriptionAction(actions, PASSWORD, "Password", "", "",

samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java

diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java
index 0787ed5..bfc50f6 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java
@@ -106,12 +106,14 @@
                 .build());
     }
 
-    private static void addEditableAction(List<GuidedAction> actions, long id, String title, String desc) {
-        actions.add(new GuidedAction.Builder()
+    private static void addEditableAction(Context context, List<GuidedAction> actions,
+            long id, String title, String desc) {
+        actions.add(new GuidedAction.Builder(context)
                 .id(id)
                 .title(title)
                 .description(desc)
                 .editable(true)
+                .icon(R.drawable.lb_ic_search_mic)
                 .build());
     }
 
@@ -306,8 +308,8 @@
 
         @Override
         public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) {
-            addEditableAction(actions, FIRST_NAME, "Pat", "Your first name");
-            addEditableAction(actions, LAST_NAME, "Smith", "Your last name");
+            addEditableAction(getContext(), actions, FIRST_NAME, "Pat", "Your first name");
+            addEditableAction(getContext(), actions, LAST_NAME, "Smith", "Your last name");
             List<GuidedAction> subActions = new ArrayList<GuidedAction>();
             addAction(actions, PAYMENT, "Select Payment", "", subActions);
             addEditableDescriptionAction(actions, PASSWORD, "Password", "", "",