Loading packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSIconViewImpl.java +3 −1 Original line number Diff line number Diff line Loading @@ -84,8 +84,10 @@ public class QSIconViewImpl extends QSIconView { protected void updateIcon(ImageView iv, State state) { if (!Objects.equals(state.icon, iv.getTag(R.id.qs_icon_tag))) { boolean shouldAnimate = iv.isShown() && mAnimationEnabled && iv.getDrawable() != null; Drawable d = state.icon != null ? iv.isShown() && mAnimationEnabled ? state.icon.getDrawable(mContext) ? shouldAnimate ? state.icon.getDrawable(mContext) : state.icon.getInvisibleDrawable(mContext) : null; int padding = state.icon != null ? state.icon.getPadding() : 0; if (d != null) { Loading packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest.java 0 → 100644 +67 −0 Original line number Diff line number Diff line /* * Copyright (C) 2017 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software distributed under the * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the specific language governing * permissions and limitations under the License. */ package com.android.systemui.qs.tileimpl; import static org.mockito.ArgumentMatchers.any; 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.graphics.drawable.Drawable; import android.testing.AndroidTestingRunner; import android.testing.UiThreadTest; import android.widget.ImageView; import com.android.systemui.SysuiTestCase; import com.android.systemui.plugins.qs.QSTile.Icon; import com.android.systemui.plugins.qs.QSTile.State; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @RunWith(AndroidTestingRunner.class) @UiThreadTest public class QSIconViewImplTest extends SysuiTestCase { private QSIconViewImpl mIconView; @Before public void setup() { mIconView = new QSIconViewImpl(mContext); } @Test public void testNoFirstAnimation() { ImageView iv = mock(ImageView.class); State s = new State(); when(iv.isShown()).thenReturn(true); // No current icon, only the static drawable should be used. s.icon = mock(Icon.class); when(iv.getDrawable()).thenReturn(null); mIconView.updateIcon(iv, s); verify(s.icon, never()).getDrawable(any()); verify(s.icon).getInvisibleDrawable(any()); // Has icon, should use the standard (animated) form. s.icon = mock(Icon.class); when(iv.getDrawable()).thenReturn(mock(Drawable.class)); mIconView.updateIcon(iv, s); verify(s.icon).getDrawable(any()); verify(s.icon, never()).getInvisibleDrawable(any()); } } Loading
packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSIconViewImpl.java +3 −1 Original line number Diff line number Diff line Loading @@ -84,8 +84,10 @@ public class QSIconViewImpl extends QSIconView { protected void updateIcon(ImageView iv, State state) { if (!Objects.equals(state.icon, iv.getTag(R.id.qs_icon_tag))) { boolean shouldAnimate = iv.isShown() && mAnimationEnabled && iv.getDrawable() != null; Drawable d = state.icon != null ? iv.isShown() && mAnimationEnabled ? state.icon.getDrawable(mContext) ? shouldAnimate ? state.icon.getDrawable(mContext) : state.icon.getInvisibleDrawable(mContext) : null; int padding = state.icon != null ? state.icon.getPadding() : 0; if (d != null) { Loading
packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest.java 0 → 100644 +67 −0 Original line number Diff line number Diff line /* * Copyright (C) 2017 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software distributed under the * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the specific language governing * permissions and limitations under the License. */ package com.android.systemui.qs.tileimpl; import static org.mockito.ArgumentMatchers.any; 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.graphics.drawable.Drawable; import android.testing.AndroidTestingRunner; import android.testing.UiThreadTest; import android.widget.ImageView; import com.android.systemui.SysuiTestCase; import com.android.systemui.plugins.qs.QSTile.Icon; import com.android.systemui.plugins.qs.QSTile.State; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @RunWith(AndroidTestingRunner.class) @UiThreadTest public class QSIconViewImplTest extends SysuiTestCase { private QSIconViewImpl mIconView; @Before public void setup() { mIconView = new QSIconViewImpl(mContext); } @Test public void testNoFirstAnimation() { ImageView iv = mock(ImageView.class); State s = new State(); when(iv.isShown()).thenReturn(true); // No current icon, only the static drawable should be used. s.icon = mock(Icon.class); when(iv.getDrawable()).thenReturn(null); mIconView.updateIcon(iv, s); verify(s.icon, never()).getDrawable(any()); verify(s.icon).getInvisibleDrawable(any()); // Has icon, should use the standard (animated) form. s.icon = mock(Icon.class); when(iv.getDrawable()).thenReturn(mock(Drawable.class)); mIconView.updateIcon(iv, s); verify(s.icon).getDrawable(any()); verify(s.icon, never()).getInvisibleDrawable(any()); } }