OSDN Git Service

Merge changes I151af596,Ib1ceddd7,I1cf84a09
authorJason Monk <jmonk@google.com>
Tue, 28 Mar 2017 17:57:14 +0000 (17:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 28 Mar 2017 17:57:21 +0000 (17:57 +0000)
* changes:
  QS: Don't animate first state change
  Fix QS getting stuck in weird animation during recreate
  Have QS fragment keep track of some state on recreate

1  2 
packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSIconViewImpl.java
packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java

  package com.android.systemui.qs;
  
  import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
  import static org.mockito.Mockito.mock;
  
+ import android.app.FragmentController;
+ import android.app.FragmentManagerNonConfig;
  import android.os.Looper;
  
 +import com.android.internal.logging.MetricsLogger;
  import com.android.keyguard.CarrierText;
  import com.android.systemui.Dependency;
  import com.android.systemui.R;