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 | |
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')
-rw-r--r-- | res/drawable/recent_lists_footer_background.xml | 4 | ||||
-rw-r--r-- | res/drawable/view_pager_tab_background.xml | 7 | ||||
-rw-r--r-- | res/values/styles.xml | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/res/drawable/recent_lists_footer_background.xml b/res/drawable/recent_lists_footer_background.xml index 566e353b2..021174a16 100644 --- a/res/drawable/recent_lists_footer_background.xml +++ b/res/drawable/recent_lists_footer_background.xml @@ -19,5 +19,7 @@ android:tint="?android:attr/colorControlHighlight" android:pinned="false"> <!-- Mask to constrain the ripple to the bounds of the view. --> - <item android:drawable="@android:color/transparent" /> + <item android:id="@android:id/mask"> + <color android:color="@android:color/white" /> + </item> </ripple> diff --git a/res/drawable/view_pager_tab_background.xml b/res/drawable/view_pager_tab_background.xml index 7dae671ad..53f891c76 100644 --- a/res/drawable/view_pager_tab_background.xml +++ b/res/drawable/view_pager_tab_background.xml @@ -16,10 +16,7 @@ --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:tint="@color/tab_ripple_color"> - <item> - <selector> - <item android:state_focused="true" - android:drawable="@drawable/tab_unselected_focused" /> - </selector> + <item android:id="@android:id/mask"> + <color android:color="@android:color/white" /> </item> </ripple>
\ No newline at end of file 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"> |