Merge "Remove unused resources in Dialer"
diff --git a/res/drawable/ic_voicemail_delete.xml b/res/drawable/ic_voicemail_delete.xml
new file mode 100644
index 0000000..e81da9a
--- /dev/null
+++ b/res/drawable/ic_voicemail_delete.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_menu_delete_dk"
+ android:gravity="center"
+ android:tint="@color/actionbar_icon_color" />
diff --git a/res/menu/call_details_options.xml b/res/menu/call_details_options.xml
index 39c8a67..c1daa6f 100644
--- a/res/menu/call_details_options.xml
+++ b/res/menu/call_details_options.xml
@@ -16,7 +16,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_trash"
- android:icon="@drawable/ic_menu_delete_dk"
+ android:icon="@drawable/ic_voicemail_delete"
android:showAsAction="ifRoom"
android:title="@string/recentCalls_trashVoicemail"
android:onClick="onMenuTrashVoicemail"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d719fcc..7d5ef71 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -106,4 +106,7 @@
<!-- Color for answered or outgoing call icons. -->
<color name="answered_call">#2aad6f</color>
+
+ <!-- Color for icons in the actionbar -->
+ <color name="actionbar_icon_color">#ffffff</color>
</resources>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 2b66355..3b68db9 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -336,6 +336,7 @@
actionBarView.setPreImeKeyListener(mSearchEditTextLayoutListener);
mSearchIcon = actionBarView.findViewById(R.id.search_magnifying_glass);
+ mVoiceSearchButton = actionBarView.findViewById(R.id.voice_search_button);
mSearchView = (EditText) actionBarView.findViewById(R.id.search_view);
mSearchView.addTextChangedListener(mPhoneSearchQueryTextListener);
@@ -658,7 +659,6 @@
}
private void prepareVoiceSearchButton() {
- mVoiceSearchButton = getActionBar().getCustomView().findViewById(R.id.voice_search_button);
final Intent voiceIntent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
if (canIntentBeHandled(voiceIntent)) {
mVoiceSearchButton.setVisibility(View.VISIBLE);