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

Commit ef36eb32 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Do not animate icons in tiles that shouldn't" into tm-qpr-dev am: c164c02c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20303001



Change-Id: I3a1d4e3e78aa4a76ad489e60236862c25dfb8d29
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6cbe45c1 c164c02c

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSIconViewImpl.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ public class QSIconViewImpl extends QSIconView { 
            iv.setTag(R.id.qs_icon_tag, icon);

            iv.setTag(R.id.qs_icon_tag, icon);

            iv.setTag(R.id.qs_slash_tag, state.slash);

            iv.setTag(R.id.qs_slash_tag, state.slash);

            iv.setPadding(0, padding, 0, padding);

            iv.setPadding(0, padding, 0, padding);

            if (d instanceof Animatable2) {

            if (shouldAnimate && d instanceof Animatable2) {

                Animatable2 a = (Animatable2) d;

                Animatable2 a = (Animatable2) d;

                a.start();

                a.start();

                if (state.isTransient) {

                if (state.isTransient) {

packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest.java

+15 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.never; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;





import android.graphics.drawable.AnimatedVectorDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.service.quicksettings.Tile;

import android.service.quicksettings.Tile;

import android.testing.AndroidTestingRunner;

import android.testing.AndroidTestingRunner;
@@ -136,6 +137,20 @@ public class QSIconViewImplTest extends SysuiTestCase { 
        assertEquals(mIconView.getColor(s1), mIconView.getColor(s2));

        assertEquals(mIconView.getColor(s1), mIconView.getColor(s2));

    }

    }





    @Test

    public void testIconNotAnimatedWhenAllowAnimationsFalse() {

        ImageView iv = new ImageView(mContext);

        AnimatedVectorDrawable d = mock(AnimatedVectorDrawable.class);

        State s = new State();

        s.icon = mock(Icon.class);

        when(s.icon.getDrawable(any())).thenReturn(d);

        when(s.icon.getInvisibleDrawable(any())).thenReturn(d);



        mIconView.updateIcon(iv, s, false);



        verify(d, never()).start();

    }



    private static Drawable.ConstantState fakeConstantState(Drawable otherDrawable) {

    private static Drawable.ConstantState fakeConstantState(Drawable otherDrawable) {

        return new Drawable.ConstantState() {

        return new Drawable.ConstantState() {

            @Override

            @Override