From 6834374a442a0692385e552fa09d0536897bb6ae Mon Sep 17 00:00:00 2001
From: Matthew Ng <ngmatthew@google.com>
Date: Fri, 12 Apr 2019 17:12:11 -0700
Subject: [PATCH] End button fade animation when its visiblity changes

Back button reappeared after dismissing ime because fade animation
ended making the back button visible even though disabled flags
tried to make button invisible.

Fixes: 130442512
Test: manual
Change-Id: I478723d79d9612e2e1177784c75e7f755070aa9f
---
 .../android/systemui/statusbar/phone/ButtonDispatcher.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
index 4ced702f479e1..959342b27b56f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
@@ -141,6 +141,11 @@ public class ButtonDispatcher {
 
     public void setVisibility(int visibility) {
         if (mVisibility == visibility) return;
+        if (mFadeAnimator != null) {
+            mFadeAnimator.cancel();
+            mFadeAnimator = null;
+        }
+
         mVisibility = visibility;
         final int N = mViews.size();
         for (int i = 0; i < N; i++) {