commit 861bb9d4402c1b9ee68e9382570f0fca3783478e
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 20 22:33:03 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 20 22:33:03 2017 +0000
tree 87c18b0b3343a67ae2075cab94cf21b410859a87
parent 599205c0bfc0107f0d4043aa9582e21e3576dfa4
parent dad839d3ef89a8c58cb94eef7d282f34d86597b9

Merge "Dialpad icon now remains white through device rotation."

java/com/android/dialer/dialpadview/DialpadFragment.java

diff --git a/java/com/android/dialer/dialpadview/DialpadFragment.java b/java/com/android/dialer/dialpadview/DialpadFragment.java
index 8d11bcb..4126443 100644
--- a/java/com/android/dialer/dialpadview/DialpadFragment.java
+++ b/java/com/android/dialer/dialpadview/DialpadFragment.java
@@ -643,7 +643,7 @@
       iconId = R.drawable.ic_wifi_calling;
     }
     mFloatingActionButtonController.changeIcon(
-        iconId, res.getString(R.string.description_dial_button));
+        getContext(), iconId, res.getString(R.string.description_dial_button));
 
     mDialpadQueryListener =
         FragmentUtils.getParentUnsafe(this, OnDialpadQueryChangedListener.class);

java/com/android/dialer/widget/FloatingActionButtonController.java

diff --git a/java/com/android/dialer/widget/FloatingActionButtonController.java b/java/com/android/dialer/widget/FloatingActionButtonController.java
index dde4d44..1f9923d 100644
--- a/java/com/android/dialer/widget/FloatingActionButtonController.java
+++ b/java/com/android/dialer/widget/FloatingActionButtonController.java
@@ -17,6 +17,8 @@
 package com.android.dialer.widget;
 
 import android.app.Activity;
+import android.content.Context;
+import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.support.annotation.DrawableRes;
 import android.support.design.widget.FloatingActionButton;
@@ -83,9 +85,11 @@
     }
   }
 
-  public void changeIcon(@DrawableRes int iconId, String description) {
+  public void changeIcon(Context context, @DrawableRes int iconId, String description) {
     if (this.mFabIconId != iconId) {
       mFab.setImageResource(iconId);
+      mFab.setImageTintList(
+          ColorStateList.valueOf(context.getResources().getColor(android.R.color.white)));
       this.mFabIconId = iconId;
     }
     if (!mFab.getContentDescription().equals(description)) {