summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-08-06 19:54:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-06 19:54:45 +0000
commit2b78727393f87316ca7460a4660e9444e60d62b1 (patch)
treeb8da048bb6b681a3fbc5383978a5493d2736ae63
parentd6bc71fa84c0d33f0e2cdd9644e663bd62273e62 (diff)
parent0e5e37ecb8216a1262bb4e98dc9b6ad77216dd46 (diff)
am 0e5e37ec: am a20f291b: am 8fd67244: Tweak Z-depth for Dialer ActionBar
* commit '0e5e37ecb8216a1262bb4e98dc9b6ad77216dd46': Tweak Z-depth for Dialer ActionBar
-rw-r--r--res/values/dimens.xml5
-rw-r--r--src/com/android/dialer/DialtactsActivity.java1
2 files changed, 4 insertions, 2 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4884bd219..cba04bdbf 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -65,7 +65,7 @@
<dimen name="favorites_row_undo_text_side_padding">32dp</dimen>
<!-- Dimensions for most recent call shortcut cards -->
- <dimen name="recent_call_log_item_translation_z">1dp</dimen>
+ <dimen name="recent_call_log_item_translation_z">3dp</dimen>
<dimen name="recent_call_log_item_margin_horizontal">8dp</dimen>
<dimen name="recent_call_log_item_margin_top">4dp</dimen>
<dimen name="recent_call_log_item_margin_bottom">6dp</dimen>
@@ -87,6 +87,7 @@
room to the search box-->
<dimen name="action_bar_height">56dp</dimen>
<dimen name="action_bar_height_large">64dp</dimen>
+ <dimen name="action_bar_elevation">2dp</dimen>
<dimen name="tab_height">43dp</dimen>
<!-- actionbar height + tab height -->
<dimen name="actionbar_and_tab_height">107dp</dimen>
@@ -111,7 +112,7 @@
<!-- Size of the icon (voice search, close search) in the search box. -->
<dimen name="search_box_icon_size">28dp</dimen>
<dimen name="search_list_padding_top">16dp</dimen>
- <dimen name="search_box_elevation">2dp</dimen>
+ <dimen name="search_box_elevation">3dp</dimen>
<!-- Padding to the left and right of call log action buttons. -->
<dimen name="call_log_action_horizontal_padding">8dp</dimen>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 7d4e2d0aa..ba9004edd 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -354,6 +354,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
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());