Support changing FAB icon to add person.

+ Add function to change the icon on the FAB. Should likely
eventually include an optional animate parameter.
+ Change FAB controller so that it recognizes the FAB button
as an ImageButton.
+ Flip add person icons to white.

Bug: 19366434
Change-Id: I5f6cf07ffce1d0eaa1aa0733f7411247cba1d6c0

6 files changed, 12 insertions, 2 deletions

diff --git a/res/drawable-hdpi/ic_person_add_24dp.png b/res/drawable-hdpi/ic_person_add_24dp.png
index 1b71ff14..10ae5a70 100644
--- a/res/drawable-hdpi/ic_person_add_24dp.png
+++ b/res/drawable-hdpi/ic_person_add_24dp.png
diff --git a/res/drawable-mdpi/ic_person_add_24dp.png b/res/drawable-mdpi/ic_person_add_24dp.png
index b6cf02df..38e0a288 100644
--- a/res/drawable-mdpi/ic_person_add_24dp.png
+++ b/res/drawable-mdpi/ic_person_add_24dp.png
diff --git a/res/drawable-xhdpi/ic_person_add_24dp.png b/res/drawable-xhdpi/ic_person_add_24dp.png
index 2d265e10..7e7c289d 100644
--- a/res/drawable-xhdpi/ic_person_add_24dp.png
+++ b/res/drawable-xhdpi/ic_person_add_24dp.png
diff --git a/res/drawable-xxhdpi/ic_person_add_24dp.png b/res/drawable-xxhdpi/ic_person_add_24dp.png
index 6091312b..8f744f03 100644
--- a/res/drawable-xxhdpi/ic_person_add_24dp.png
+++ b/res/drawable-xxhdpi/ic_person_add_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_person_add_24dp.png b/res/drawable-xxxhdpi/ic_person_add_24dp.png
index c33a0d0e..2fa2cca8 100644
--- a/res/drawable-xxxhdpi/ic_person_add_24dp.png
+++ b/res/drawable-xxxhdpi/ic_person_add_24dp.png
diff --git a/src/com/android/contacts/common/widget/FloatingActionButtonController.java b/src/com/android/contacts/common/widget/FloatingActionButtonController.java
index 679eb7b4..b06cda16 100644
--- a/src/com/android/contacts/common/widget/FloatingActionButtonController.java
+++ b/src/com/android/contacts/common/widget/FloatingActionButtonController.java
@@ -18,9 +18,11 @@ package com.android.contacts.common.widget;
 
 import android.app.Activity;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 import android.view.View;
+import android.widget.ImageButton;
 
 import com.android.contacts.common.util.ViewUtil;
 import com.android.contacts.common.R;
@@ -42,11 +44,11 @@ public class FloatingActionButtonController {
     private final int mFloatingActionButtonWidth;
     private final int mFloatingActionButtonMarginRight;
     private final View mFloatingActionButtonContainer;
-    private final View mFloatingActionButton;
+    private final ImageButton mFloatingActionButton;
     private final Interpolator mFabInterpolator;
     private int mScreenWidth;
 
-    public FloatingActionButtonController(Activity activity, View container, View button) {
+    public FloatingActionButtonController(Activity activity, View container, ImageButton button) {
         Resources resources = activity.getResources();
         mFabInterpolator = AnimationUtils.loadInterpolator(activity,
                 android.R.interpolator.fast_out_slow_in);
@@ -80,6 +82,14 @@ public class FloatingActionButtonController {
         mFloatingActionButtonContainer.setVisibility(visible ? View.VISIBLE : View.GONE);
     }
 
+    public void changeIcon(Drawable icon, String description) {
+        if (mFloatingActionButton.getDrawable() != icon
+                || !mFloatingActionButton.getContentDescription().equals(description)) {
+            mFloatingActionButton.setImageDrawable(icon);
+            mFloatingActionButton.setContentDescription(description);
+        }
+    }
+
     /**
      * Updates the FAB location (middle to right position) as the PageView scrolls.
      *