Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf49af85 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "QS: Don't animate first state change" into oc-dev

am: 462eeda6

Change-Id: I73ff4ac6f2c79a23e4b8c57037927e2a811d0db5
parents 5f5c7007 462eeda6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ public class QSIconViewImpl extends QSIconView {
        if (state.state != mState) {
            int color = getColor(state.state);
            mState = state.state;
            if (iv.isShown()) {
            if (iv.isShown() && mTint != 0) {
                animateGrayScale(mTint, color, iv);
                mTint = color;
            } else {
+16 −0
Original line number Diff line number Diff line
@@ -15,12 +15,15 @@
package com.android.systemui.qs.tileimpl;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import android.content.res.ColorStateList;
import android.graphics.drawable.Drawable;
import android.service.quicksettings.Tile;
import android.testing.AndroidTestingRunner;
import android.testing.UiThreadTest;
import android.widget.ImageView;
@@ -32,6 +35,7 @@ import com.android.systemui.plugins.qs.QSTile.State;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatcher;

@RunWith(AndroidTestingRunner.class)
@UiThreadTest
@@ -64,4 +68,16 @@ public class QSIconViewImplTest extends SysuiTestCase {
        verify(s.icon).getDrawable(any());
        verify(s.icon, never()).getInvisibleDrawable(any());
    }

    @Test
    public void testNoFirstFade() {
        ImageView iv = mock(ImageView.class);
        State s = new State();
        s.state = Tile.STATE_ACTIVE;
        int desiredColor = mIconView.getColor(s.state);
        when(iv.isShown()).thenReturn(true);

        mIconView.setIcon(iv, s);
        verify(iv).setImageTintList(argThat(stateList -> stateList.getColors()[0] == desiredColor));
    }
}