diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-08-04 19:03:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-04 19:03:25 +0000 |
| commit | a772e670974119cdda048089fe2f66e14f15dc1c (patch) | |
| tree | bdb6983044c7dcfe9ddbc443d22fc07e544cbce8 /res | |
| parent | 8e6421c2c86f581177acd5136e69d85c53107041 (diff) | |
| parent | 2854582cbd99c7367899a75860db3331cecbd745 (diff) | |
am 2854582c: am c7d420ad: am 3c9ea9dd: Merge "Swap out FAB background" into lmp-dev
* commit '2854582cbd99c7367899a75860db3331cecbd745':
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> |
