diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-08-04 18:56:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-04 18:56:48 +0000 |
| commit | c7d420ad46fa90fa6ac18569deb581255650cc45 (patch) | |
| tree | b92133c0aa340709d1d00de71a292d50fbeebf5c /res | |
| parent | 4a89dfcd9d772fd8c6355837d5ba4218391eaee6 (diff) | |
| parent | 3c9ea9dd0801da619f64199dd83a670a84458fef (diff) | |
am 3c9ea9dd: Merge "Swap out FAB background" into lmp-dev
* commit '3c9ea9dd0801da619f64199dd83a670a84458fef':
Swap out FAB background
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/fab_blue.png (renamed from res/drawable-hdpi/fab_teal_background.png) | bin | 2805 -> 2805 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/fab_blue.png (renamed from res/drawable-mdpi/fab_teal_background.png) | bin | 1841 -> 1841 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/fab_blue.png (renamed from res/drawable-xhdpi/fab_teal_background.png) | bin | 4085 -> 4085 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/fab_blue.png (renamed from res/drawable-xxhdpi/fab_teal_background.png) | bin | 7009 -> 7009 bytes | |||
| -rw-r--r-- | res/drawable/floating_action_button.xml | 2 |
5 files changed, 1 insertions, 1 deletions
diff --git a/res/drawable-hdpi/fab_teal_background.png b/res/drawable-hdpi/fab_blue.png Binary files differindex b36439e53..8ff3d2918 100644 --- a/res/drawable-hdpi/fab_teal_background.png +++ b/res/drawable-hdpi/fab_blue.png diff --git a/res/drawable-mdpi/fab_teal_background.png b/res/drawable-mdpi/fab_blue.png Binary files differindex 55f9bb5cc..2ca6b4bdf 100644 --- a/res/drawable-mdpi/fab_teal_background.png +++ b/res/drawable-mdpi/fab_blue.png diff --git a/res/drawable-xhdpi/fab_teal_background.png b/res/drawable-xhdpi/fab_blue.png Binary files differindex d6379c215..300b07eb4 100644 --- a/res/drawable-xhdpi/fab_teal_background.png +++ b/res/drawable-xhdpi/fab_blue.png diff --git a/res/drawable-xxhdpi/fab_teal_background.png b/res/drawable-xxhdpi/fab_blue.png Binary files differindex 76d68ac6a..76d68ac6a 100644 --- a/res/drawable-xxhdpi/fab_teal_background.png +++ b/res/drawable-xxhdpi/fab_blue.png diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml index d518dddd4..347e9d490 100644 --- a/res/drawable/floating_action_button.xml +++ b/res/drawable/floating_action_button.xml @@ -17,5 +17,5 @@ <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/dialer_accent_color"> - <item android:drawable="@drawable/fab_teal_background" /> + <item android:drawable="@drawable/fab_blue" /> </ripple> |
