From 4a852c1a75fd0270bb09451b12c50a6c720c0502 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Wed, 6 Aug 2014 15:45:40 -0700
Subject: Correctly transmit dialpad visibility to updateExtraButtonRow

State of the dialpad's visibility is not correct until the
fragment transaction is complete. Use the checked state of the dialpad
button instead as a future indicator.

Bug: 14493250
Change-Id: I05d68096e2e7897c78467ad107e815f7005b81a8
---
 InCallUI/src/com/android/incallui/CallButtonPresenter.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index 2e2ea4ebf..5b253c9bb 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -222,7 +222,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
     public void showDialpadClicked(boolean checked) {
         Log.v(this, "Show dialpad " + String.valueOf(checked));
         getUi().displayDialpad(checked /* show */, true /* animate */);
-        updateExtraButtonRow();
+        updateExtraButtonRow(checked);
     }
 
     public void changeToVideoClicked() {
@@ -317,7 +317,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
         final boolean isGenericConference = call.can(CallCapabilities.GENERIC_CONFERENCE);
         mShowGenericMerge = isGenericConference && canMerge;
         mShowManageConference = (call.isConferenceCall() && !isGenericConference);
-        updateExtraButtonRow();
+        updateExtraButtonRow(ui.isDialpadVisible());
     }
 
     private void updateVideoCallButtons() {
@@ -410,13 +410,14 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
         }
     }
 
-    private void updateExtraButtonRow() {
+    private void updateExtraButtonRow(boolean isDialpadVisible) {
         final boolean showExtraButtonRow = (mShowGenericMerge || mShowManageConference) &&
-                !getUi().isDialpadVisible();
+                !isDialpadVisible;
 
         Log.d(this, "isGeneric: " + mShowGenericMerge);
         Log.d(this, "mShowManageConference : " + mShowManageConference);
         Log.d(this, "mShowGenericMerge: " + mShowGenericMerge);
+        Log.d(this, "isDialpadVisible: " + isDialpadVisible);
         if (showExtraButtonRow) {
             if (mShowGenericMerge) {
                 getUi().showGenericMergeButton();
-- 
cgit v1.2.3