commit aa8991392e4475ba489d5565983112fd806bafc6
author The Android Automerger <android-build@google.com> Mon May 19 05:50:06 2014 -0700
committer The Android Automerger <android-build@google.com> Mon May 19 05:50:06 2014 -0700
tree 0d3211ac27b6deda61496c58a6721e9593b1405c
parent ddfb00180a56f254857289a1b9be51556b2ac0f9
parent 65c96648f08dc939117805913b33d2de4860fb83

merge in master-release history after reset to ddfb00180a56f254857289a1b9be51556b2ac0f9

src/com/android/dialer/DialtactsActivity.java

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);