From 79a9f2f59de5a1591f41aaf75b56f014be91772d Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Thu, 10 Mar 2016 14:55:22 -0500 Subject: [PATCH] Make sure that QQS is invisible on lock screen Bug: 27536311 Change-Id: Idf5492ac4fd134761139156291968cc5c992ad52 --- .../src/com/android/systemui/qs/QSAnimator.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java index b611ba3efc359..f601f908be2f8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java @@ -198,6 +198,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha } mNonfirstPageAnimator = new TouchAnimator.Builder() .addFloat(mQuickQsPanel, "alpha", 1, 0) + .setListener(mNonFirstPageListener) .setEndDelay(.5f) .build(); } @@ -267,7 +268,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha private void clearAnimationState() { final int N = mAllViews.size(); mQuickQsPanel.setAlpha(0); - mQuickQsPanel.setVisibility(View.VISIBLE); + mQuickQsPanel.setVisibility(View.INVISIBLE); for (int i = 0; i < N; i++) { View v = mAllViews.get(i); v.setAlpha(1); @@ -293,6 +294,14 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha mQsPanel.post(mUpdateAnimators); } + private final TouchAnimator.Listener mNonFirstPageListener = + new TouchAnimator.ListenerAdapter() { + @Override + public void onAnimationStarted() { + mQuickQsPanel.setVisibility(View.VISIBLE); + } + }; + private Runnable mUpdateAnimators = new Runnable() { @Override public void run() {