commit 7c29314b8416ee0b17d6bd54342b8db1620b236c
author Nancy Chen <nancychen@google.com> Thu Sep 11 15:59:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 11 15:59:02 2014 +0000
tree 8e198f40ed3e1d630d1d01afc83c9a63ec4e661d
parent baa02bc760fcc7a4549dfcad71dbc5586cf43216
parent 3ffef7aeea2b470229b54e684e12b14e7d8ce8dd

am 3ffef7ae: Merge "Set default action bar elevation for dialer." into lmp-dev

* commit '3ffef7aeea2b470229b54e684e12b14e7d8ce8dd':
  Set default action bar elevation for dialer.

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 74a5231..1fe8aec 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -123,6 +123,7 @@
         <item name="android:background">@color/actionbar_background_color</item>
         <item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item>
         <item name="android:height">@dimen/action_bar_height</item>
+        <item name="android:elevation">@dimen/action_bar_elevation</item>
         <!-- Empty icon -->
         <item name="android:icon">@android:color/transparent</item>
         <!-- Shift the title text to the right -->

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index d7bfb00..00d5937 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -352,7 +352,6 @@
         actionBar.setCustomView(R.layout.search_edittext);
         actionBar.setDisplayShowCustomEnabled(true);
         actionBar.setBackgroundDrawable(null);
-        actionBar.setElevation(resources.getDimensionPixelSize(R.dimen.action_bar_elevation));
 
         mActionBarController = new ActionBarController(this,
                 (SearchEditTextLayout) actionBar.getCustomView());