diff options
| author | Andrew Lee <anwlee@google.com> | 2014-06-05 16:02:08 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2014-06-05 16:02:08 -0700 |
| commit | 99f1356fbd86dbffffb58ba90ecb376f85398161 (patch) | |
| tree | 176c960959aef67554e80e2e707ebf81aa931cf9 /res/values/styles.xml | |
| parent | de717a16a2ccf4fc8131e7aa437d43a4bc7becd7 (diff) | |
| parent | d29b7ef2868176995cf43b56a28336688f9744d3 (diff) | |
resolved conflicts for merge of d29b7ef2 to master
Conflicts:
res/layout/search_edittext.xml
Change-Id: I80be0bb33adb57853a1e9b5ee97966df172bd5a3
Diffstat (limited to 'res/values/styles.xml')
| -rw-r--r-- | res/values/styles.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 004b7099f..529401138 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -121,6 +121,7 @@ <item name="android:height">@dimen/action_bar_height</item> <!-- Empty icon --> <item name="android:icon">@android:color/transparent</item> + <item name="android:contentInsetStart">@dimen/search_margin_horizontal</item> </style> <style name="DialtactsActionBarWithoutTitleStyle" parent="DialtactsActionBarStyle"> |