From 311c5250451bf5985761690568e3e70ca3b28664 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Tue, 27 Feb 2018 16:43:37 -0800 Subject: Fab now hides/shows correctly when you enter and leave the voicemail tab. Test: manual, going between tabs hides/shows the fab properly when ToS is (in)visible. PiperOrigin-RevId: 187253210 Change-Id: Ied9ea44892786268b9dfa68816840dfbfc74aa6e --- java/com/android/dialer/app/calllog/CallLogFragment.java | 2 +- java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'java/com/android/dialer/app/calllog') diff --git a/java/com/android/dialer/app/calllog/CallLogFragment.java b/java/com/android/dialer/app/calllog/CallLogFragment.java index d8496f106..11c249944 100644 --- a/java/com/android/dialer/app/calllog/CallLogFragment.java +++ b/java/com/android/dialer/app/calllog/CallLogFragment.java @@ -626,7 +626,7 @@ public class CallLogFragment extends Fragment @CallSuper public void onVisible() { LogUtil.enterBlock("CallLogFragment.onPageSelected"); - if (getActivity() != null && getActivity() instanceof HostInterface) { + if (getActivity() != null && FragmentUtils.getParent(this, HostInterface.class) != null) { FragmentUtils.getParentUnsafe(this, HostInterface.class) .enableFloatingButton(!isModalAlertVisible()); } diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java index 8b504737b..f1ede8908 100644 --- a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java +++ b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java @@ -158,7 +158,7 @@ public class VisualVoicemailCallLogFragment extends CallLogFragment { public void onVisible() { LogUtil.enterBlock("VisualVoicemailCallLogFragment.onVisible"); super.onVisible(); - if (getActivity() != null) { + if (getActivity() != null && preSyncVoicemailStatusCheckExecutor != null) { preSyncVoicemailStatusCheckExecutor.executeParallel(getActivity()); Logger.get(getActivity()).logImpression(DialerImpression.Type.VVM_TAB_VIEWED); getActivity().setVolumeControlStream(VoicemailAudioManager.PLAYBACK_STREAM); -- cgit v1.2.3