Move mic button to its own fragment.

Bug: 37317932
Test: Manually tested. Mic does not show up in every fragment anymore.
Change-Id: Ic219e570e0c8426119db96b781892f1186e51fef

1 files changed, 10 insertions, 19 deletions

diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
index 11e5841016..83342862c0 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
@@ -35,6 +35,7 @@ import android.widget.Toast;
 import com.android.car.app.CarDrawerActivity;
 import com.android.car.app.CarDrawerAdapter;
 import com.android.car.app.DrawerItemViewHolder;
+import com.google.android.car.kitchensink.assistant.CarAssistantFragment;
 import com.google.android.car.kitchensink.audio.AudioTestFragment;
 import com.google.android.car.kitchensink.bluetooth.BluetoothHeadsetFragment;
 import com.google.android.car.kitchensink.bluetooth.MapMceTestFragment;
@@ -54,6 +55,7 @@ public class KitchenSinkActivity extends CarDrawerActivity {
     private static final String TAG = "KitchenSinkActivity";
 
     private static final String MENU_AUDIO = "audio";
+    private static final String MENU_ASSISTANT = "assistant";
     private static final String MENU_HVAC = "hvac";
     private static final String MENU_QUIT = "quit";
     private static final String MENU_JOB = "job_scheduler";
@@ -87,7 +89,7 @@ public class KitchenSinkActivity extends CarDrawerActivity {
     private OrientationTestFragment mOrientationFragment;
     private MapMceTestFragment mMapMceTestFragment;
     private BluetoothHeadsetFragment mBluetoothHeadsetFragement;
-    private ImageView mMic;
+    private CarAssistantFragment mAssistantFragment;
 
     private final CarSensorManager.OnSensorChangedListener mListener = (manager, event) -> {
         switch (event.sensorType) {
@@ -106,23 +108,6 @@ public class KitchenSinkActivity extends CarDrawerActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setMainContent(R.layout.kitchen_content);
-        mMic = (ImageView) findViewById(R.id.voice_button);
-        mMic.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                v.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
-                Intent intent = new Intent();
-                intent.setAction(
-                        KitchenSinkActivity.this.getString(R.string.assistant_activity_action));
-                if (intent.resolveActivity(getPackageManager()) != null) {
-                    startActivity(intent);
-                } else {
-                    Toast.makeText(KitchenSinkActivity.this,
-                            "Assistant app is not available.", Toast.LENGTH_SHORT).show();
-                }
-            }
-        });
-
         // Connection to Car Service does not work for non-automotive yet.
         if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {
             mCarApi = Car.createCar(this, mCarConnectionCallback);
@@ -210,7 +195,7 @@ public class KitchenSinkActivity extends CarDrawerActivity {
     private final class DrawerAdapter extends CarDrawerAdapter {
 
         private final String mAllMenus[] = {
-                MENU_AUDIO, MENU_RADIO, MENU_HVAC, MENU_JOB,
+                MENU_AUDIO, MENU_ASSISTANT, MENU_RADIO, MENU_HVAC, MENU_JOB,
                 MENU_CLUSTER, MENU_INPUT_TEST, MENU_SENSORS, MENU_VOLUME_TEST,
                 MENU_TOUCH_TEST, MENU_CUBES_TEST, MENU_CAR_SETTINGS, MENU_ORIENTATION,
                 MENU_BLUETOOTH_HEADSET, MENU_MAP_MESSAGING, MENU_QUIT
@@ -241,6 +226,12 @@ public class KitchenSinkActivity extends CarDrawerActivity {
                     }
                     showFragment(mAudioTestFragment);
                     break;
+                case MENU_ASSISTANT:
+                    if (mAssistantFragment == null) {
+                        mAssistantFragment = new CarAssistantFragment();
+                    }
+                    showFragment(mAssistantFragment);
+                    break;
                 case MENU_RADIO:
                     if (mRadioTestFragment == null) {
                         mRadioTestFragment = new RadioTestFragment();