Merge "Add a mic button to use Activity#showAssist." into pi-dev

2 files changed, 21 insertions, 5 deletions

diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/car_assistant.xml b/tests/EmbeddedKitchenSinkApp/res/layout/car_assistant.xml
index 759a73e1..89d67bea 100644
--- a/tests/EmbeddedKitchenSinkApp/res/layout/car_assistant.xml
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/car_assistant.xml
@@ -17,8 +17,13 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
     <ImageView
-        android:id="@+id/voice_button"
+        android:id="@+id/voice_button_intent"
         android:layout_gravity="center"
         android:src="@drawable/ic_voice_assistant_mic"
         style="@style/OverviewButton"/>
-</LinearLayout>
\ No newline at end of file
+    <ImageView
+        android:id="@+id/voice_button_service"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_voice_assistant_mic"
+        style="@style/OverviewButton"/>
+</LinearLayout>
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/assistant/CarAssistantFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/assistant/CarAssistantFragment.java
index 147b017b..4bee4532 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/assistant/CarAssistantFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/assistant/CarAssistantFragment.java
@@ -31,15 +31,18 @@ import com.google.android.car.kitchensink.R;
 
 public class CarAssistantFragment extends Fragment {
 
-    private ImageView mMic;
+    private ImageView mMicIntent;
+    private ImageView mMicService;
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.car_assistant, container, false);
-        mMic = (ImageView) v.findViewById(R.id.voice_button);
+        mMicIntent = (ImageView) v.findViewById(R.id.voice_button_intent);
+        mMicService = (ImageView) v.findViewById(R.id.voice_button_service);
         Context context = getContext();
-        mMic.setOnClickListener(new View.OnClickListener() {
+
+        mMicIntent.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 v.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
@@ -54,6 +57,14 @@ public class CarAssistantFragment extends Fragment {
                 }
             }
         });
+        mMicService.setOnClickListener(v1 -> {
+            v1.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
+            boolean success = getActivity().showAssist(null);
+            if (!success) {
+                Toast.makeText(context,
+                        "Assistant app is not available.", Toast.LENGTH_SHORT).show();
+            }
+        });
         return v;
     }
 }