Remove sound settings from ui lib
Fixes: 140069125
Test: Manual
Change-Id: Ib1e3d5b88e322e5db53ab3022d183441a4e10cc7
diff --git a/car-ui-lib/res/drawable/car_ui_icon_sound_settings.xml b/car-ui-lib/res/drawable/car_ui_icon_sound_settings.xml
deleted file mode 100644
index d3af406..0000000
--- a/car-ui-lib/res/drawable/car_ui_icon_sound_settings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="36dp"
- android:height="36dp"
- android:viewportWidth="48.0"
- android:viewportHeight="48.0">
- <path
- android:fillColor="#fffafafa"
- android:pathData="M20,40h8L28,8h-8v32zM8,40h8L16,24L8,24v16zM32,18v22h8L40,18h-8z" />
-</vector>
diff --git a/car-ui-lib/res/values/strings.xml b/car-ui-lib/res/values/strings.xml
index b66f0bd..229c8b2 100644
--- a/car-ui-lib/res/values/strings.xml
+++ b/car-ui-lib/res/values/strings.xml
@@ -33,8 +33,6 @@
<string name="car_ui_toolbar_menu_item_search_title">Search</string>
<!-- Title of the settings menu item. Will be displayed if the button is in the overflow menu. [CHAR_LIMIT=50] -->
<string name="car_ui_toolbar_menu_item_settings_title">Settings</string>
- <!-- Title of the sound settings menu item. Will be displayed if the button is in the overflow menu. [CHAR_LIMIT=50] -->
- <string name="car_ui_toolbar_menu_item_sound_settings_title">Sound Settings</string>
<!-- Title of the overflow menu item. Only used for content descriptions. [CHAR_LIMIT=50] -->
<string name="car_ui_toolbar_menu_item_overflow_title">Overflow</string>
diff --git a/car-ui-lib/src/com/android/car/ui/toolbar/MenuItem.java b/car-ui-lib/src/com/android/car/ui/toolbar/MenuItem.java
index a00b73c..de57fc2 100644
--- a/car-ui-lib/src/com/android/car/ui/toolbar/MenuItem.java
+++ b/car-ui-lib/src/com/android/car/ui/toolbar/MenuItem.java
@@ -501,20 +501,6 @@
}
/**
- * Creates an equalizer MenuItem.
- *
- * <p>The advantage of using this over creating your own is getting an OEM-styled
- * sound settings icon.
- */
- public static MenuItem createSoundSettings(Context c, OnClickListener listener) {
- return new Builder(c)
- .setTitle(R.string.car_ui_toolbar_menu_item_sound_settings_title)
- .setIcon(R.drawable.car_ui_icon_sound_settings)
- .setOnClickListener(listener)
- .build();
- }
-
- /**
* Creates a settings MenuItem.
*
* <p>The advantage of this over creating your own is getting an OEM-styled settings icon,
diff --git a/car-ui-lib/tests/apitest/current.xml b/car-ui-lib/tests/apitest/current.xml
index 3604254..87b0717 100644
--- a/car-ui-lib/tests/apitest/current.xml
+++ b/car-ui-lib/tests/apitest/current.xml
@@ -151,7 +151,6 @@
<public type="drawable" name="car_ui_icon_overflow_menu"/>
<public type="drawable" name="car_ui_icon_search"/>
<public type="drawable" name="car_ui_icon_settings"/>
- <public type="drawable" name="car_ui_icon_sound_settings"/>
<public type="drawable" name="car_ui_list_item_divider"/>
<public type="drawable" name="car_ui_preference_icon_chevron"/>
<public type="drawable" name="car_ui_recyclerview_button_ripple_background"/>
@@ -184,7 +183,6 @@
<public type="string" name="car_ui_toolbar_menu_item_overflow_title"/>
<public type="string" name="car_ui_toolbar_menu_item_search_title"/>
<public type="string" name="car_ui_toolbar_menu_item_settings_title"/>
- <public type="string" name="car_ui_toolbar_menu_item_sound_settings_title"/>
<public type="style" name="CarUiPreferenceTheme"/>
<public type="style" name="Preference.CarUi"/>
<public type="style" name="Preference.CarUi.Category"/>
