aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Sauer <nicksauer@google.com>2018-06-06 15:32:15 -0700
committerNicholas Sauer <nicksauer@google.com>2018-06-06 17:30:20 -0700
commit314150ee784b102877048e8d9e61f87c762e3c79 (patch)
tree3271a54375e67d1c70aeb751d15ccbea0e68aae5
parentf5a142d88a464781d592052a41fe37c81b56c74b (diff)
downloadCar-314150ee784b102877048e8d9e61f87c762e3c79.tar.gz
Add a mic button to use Activity#showAssist.
bug: 73800527 Test: m EmbeddedKitchenSinkApp && install. Try both buttons and see assistant. Change-Id: I70efebe8c36fd65b66f41fc0d568d5279ba04661
-rw-r--r--tests/EmbeddedKitchenSinkApp/res/layout/car_assistant.xml9
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/assistant/CarAssistantFragment.java17
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 759a73e150..89d67beaff 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 147b017bd5..4bee4532cf 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;
}
}