aboutsummaryrefslogtreecommitdiff
path: root/tests/EmbeddedKitchenSinkApp/res
diff options
context:
space:
mode:
authorScott Randolph <randolphs@google.com>2018-01-11 15:09:21 -0800
committerScott Randolph <randolphs@google.com>2018-01-12 17:07:17 -0800
commit8be360aea6b072a46f33314289119b9b49dc94ca (patch)
tree1ff2d0f203997a5c04056e3f5260e44a4158a702 /tests/EmbeddedKitchenSinkApp/res
parent2c983a38751b1d1cb4666bc4fc61baacb28d3667 (diff)
downloadCar-8be360aea6b072a46f33314289119b9b49dc94ca.tar.gz
Remove retired VHAL audio properties
Don't depend on Audio related vhal properites, and remove the kitchen sink UI related to car audio focus. Test: Build and run Kitchensink on Mojave Change-Id: I541ef4b027db37140b67aa34db79a07b69e7b63b
Diffstat (limited to 'tests/EmbeddedKitchenSinkApp/res')
-rw-r--r--tests/EmbeddedKitchenSinkApp/res/layout/audio.xml6
-rw-r--r--tests/EmbeddedKitchenSinkApp/res/values/strings.xml2
2 files changed, 0 insertions, 8 deletions
diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/audio.xml b/tests/EmbeddedKitchenSinkApp/res/layout/audio.xml
index 0563220230..deb4f138a7 100644
--- a/tests/EmbeddedKitchenSinkApp/res/layout/audio.xml
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/audio.xml
@@ -28,12 +28,6 @@
android:layout_height="wrap_content"
android:textOn="@string/mock_audio_on"
android:textOff="@string/mock_audio_off" />
- <ToggleButton
- android:id="@+id/button_reject_audio_focus"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textOn="@string/reject_audio_focus_on"
- android:textOff="@string/reject_audio_focus_off" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
diff --git a/tests/EmbeddedKitchenSinkApp/res/values/strings.xml b/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
index 51a9223bbd..a609a44855 100644
--- a/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
+++ b/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
@@ -116,8 +116,6 @@
<string name="microphone_off">Mic Off</string>
<string name="mock_audio_on">Audio Mocking On</string>
<string name="mock_audio_off">Audio Mocking Off</string>
- <string name="reject_audio_focus_on">Reject Audio Focus</string>
- <string name="reject_audio_focus_off">Allow Audio Focus</string>
<!-- job scheduler -->
<string name="schedule_button">Schedule a New Job</string>