From 59b9b73c651d607e6416c5283d2f6812a469b5c4 Mon Sep 17 00:00:00 2001 From: Serg Date: Mon, 12 Sep 2016 11:29:29 -0400 Subject: [PATCH] Corrected views visibility on hide bubbles Auditors: @bbondy --- .../src/main/java/com/linkbubble/ui/CanvasView.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Application/LinkBubble/src/main/java/com/linkbubble/ui/CanvasView.java b/Application/LinkBubble/src/main/java/com/linkbubble/ui/CanvasView.java index 97a1c62b8..356325928 100644 --- a/Application/LinkBubble/src/main/java/com/linkbubble/ui/CanvasView.java +++ b/Application/LinkBubble/src/main/java/com/linkbubble/ui/CanvasView.java @@ -340,6 +340,10 @@ private void setContentView(TabView bubble, boolean unhideNotification) { if (mExpanded) { applyContentViewAlpha(1); } + else { + mContentView.setAlpha(0f); + mContentView.setVisibility(GONE); + } mContentView.onCurrentContentViewChanged(false); } @@ -350,7 +354,6 @@ private void setContentView(TabView bubble, boolean unhideNotification) { //} //Log.d("blerg", "setContentView(): from " + (mContentView != null ? "valid" : "none") + " to " + (contentView != null ? "valid" : "none")); - mContentView = contentView; if (unhideNotification) { return; @@ -511,6 +514,7 @@ public void onBeginAnimateFinalTabAway(MainController.BeginAnimateFinalTabAwayEv @SuppressWarnings("unused") @Subscribe public void onHideContentEvent(MainController.HideContentEvent event) { + mExpanded = false; setContentView(null, false); }