Merge "Fix footer not being hidden in detail panels" into oc-dev

am: 2a0b423cd4

Change-Id: I97266821c07fd307dbe04e5d715792e57bfa9c0d

diff --cc packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
index 3f00276,aa01c9e..90275c5
--- 1/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
--- 2/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
@@@ -79,8 -80,9 +79,8 @@@ public class QSFragment extends Fragmen
          mHeader = view.findViewById(R.id.header);
          mFooter = view.findViewById(R.id.qs_footer);
          mContainer = view.findViewById(id.quick_settings_container);
 -        mGutterHeight = getContext().getResources().getDimensionPixelSize(R.dimen.qs_gutter_height);
  
-         mQSDetail.setQsPanel(mQSPanel, mHeader);
+         mQSDetail.setQsPanel(mQSPanel, mHeader, mFooter);
  
          // If the quick settings row is not shown, then there is no need for the animation from
          // the row to the full QS panel.

diff --cc packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java
index 59eca50,d270de8..6a85511
--- 1/packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java
--- 2/packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java
@@@ -23,8 -23,9 +23,10 @@@ import static org.mockito.Mockito.mock
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
+ import org.junit.After;
+ import org.junit.Ignore;
  import android.support.test.filters.SmallTest;
 +import android.support.test.filters.FlakyTest;
  import android.testing.AndroidTestingRunner;
  import android.testing.TestableLooper;
  import android.testing.TestableLooper.RunWithLooper;