From 8dab453962327e01c6f2e2a22d61540d1c3d6f47 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Wed, 15 Nov 2017 14:16:43 -0800 Subject: Dialpad FAB no longer loses it's icon on fragment resume. There must be a bug in FloatingActionButton because when you call setImageDrawable multiple times (possibly with the same drawable/icon), the FAB renders with no icon present. That's why the icon would disappear in Fragment#onResume. Bug: 69006360 Test: manual PiperOrigin-RevId: 175878924 Change-Id: I1c36be3f9aeb003410f0bdbb9d52b5a483262f03 --- java/com/android/dialer/dialpadview/DialpadFragment.java | 2 +- java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'java/com/android/dialer/dialpadview') diff --git a/java/com/android/dialer/dialpadview/DialpadFragment.java b/java/com/android/dialer/dialpadview/DialpadFragment.java index e85b57e33..8d11bcbe3 100644 --- a/java/com/android/dialer/dialpadview/DialpadFragment.java +++ b/java/com/android/dialer/dialpadview/DialpadFragment.java @@ -643,7 +643,7 @@ public class DialpadFragment extends Fragment iconId = R.drawable.ic_wifi_calling; } mFloatingActionButtonController.changeIcon( - res.getDrawable(iconId, null), res.getString(R.string.description_dial_button)); + iconId, res.getString(R.string.description_dial_button)); mDialpadQueryListener = FragmentUtils.getParentUnsafe(this, OnDialpadQueryChangedListener.class); diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml index 2f62e1407..2e6b6eca0 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml @@ -66,6 +66,7 @@ android:layout_centerHorizontal="true" android:contentDescription="@string/description_dial_button" android:src="@drawable/quantum_ic_call_vd_theme_24" + android:tint="#ffffff" app:backgroundTint="@color/dialpad_fab_green" app:colorControlNormal="#ffffff" app:elevation="@dimen/floating_action_button_translation_z"/> -- cgit v1.2.3