summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2014-08-02 13:04:44 +0200
committerDanny Baumann <dannybaumann@web.de>2014-08-02 13:04:44 +0200
commitd93fdb398a2dc7592a230432be568b3fb448fbd5 (patch)
treea53a0fa4f1a8f2d0f4d07e1289b91ab377c498bc /src
parent41756079eec5fa1a606b6e206bbe1a9e4ce04c3f (diff)
downloadpackages_apps_InCallUI-d93fdb398a2dc7592a230432be568b3fb448fbd5.tar.gz
packages_apps_InCallUI-d93fdb398a2dc7592a230432be568b3fb448fbd5.tar.bz2
packages_apps_InCallUI-d93fdb398a2dc7592a230432be568b3fb448fbd5.zip
Fix call buttons being incorrectly hidden.
They were hidden incorrectly when having full-screen caller photo enabled and an outgoing call is terminated without being answered. Change-Id: I817a1f8d37c83aabb5470ee1ed6329b79302d338
Diffstat (limited to 'src')
-rw-r--r--src/com/android/incallui/CallButtonPresenter.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/incallui/CallButtonPresenter.java b/src/com/android/incallui/CallButtonPresenter.java
index 5762e7a4..e9ff5ab4 100644
--- a/src/com/android/incallui/CallButtonPresenter.java
+++ b/src/com/android/incallui/CallButtonPresenter.java
@@ -280,7 +280,9 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
} else { // DISCONNECTING, NO_CALLS
// Keep UI visible in case it was visible before, don't cause
// unneccessary layout changes
- isVisible = mStateBeforeDisconnect == InCallState.INCALL;
+ isVisible = mStateBeforeDisconnect != null &&
+ !mStateBeforeDisconnect.isIncoming() &&
+ mStateBeforeDisconnect.isConnectingOrConnected();
}
ui.setEnabled(isEnabled, isVisible);