Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a caching issue where icons could stay greyscale

Browse Source 
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java
Change-Id: I61a86c67b14ffcd469a1126f7e285fc3b9ea629d
Fixes: 33942177
This commit is contained in:
Selim Cinek
2016-12-29 14:22:21 +01:00
parent 1ce0793ab4
commit 2b6eb803ef
2 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
View File

@@ -221,6 +221,8 @@ public class StatusBarIconView extends AnimatedImageView {
setContentDescription(icon.contentDescription);
if (!iconEquals) {
if (!updateDrawable(false /* no clear */)) return false;
// we have to clear the grayscale tag since it may have changed
setTag(R.id.icon_is_grayscale, null);
}
if (!levelEquals) {
setImageLevel(icon.iconLevel);

58
packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java Normal file
View File

@@ -0,0 +1,58 @@
/*
* Copyright (C) 2016 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.statusbar;
import android.graphics.drawable.Icon;
import android.os.Debug;
import android.os.UserHandle;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.internal.statusbar.StatusBarIcon;
import com.android.systemui.R;
import com.android.systemui.SysuiTestCase;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import static junit.framework.Assert.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@SmallTest
@RunWith(AndroidJUnit4.class)
public class StatusBarIconViewTest extends SysuiTestCase {
private StatusBarIconView mIconView;
private StatusBarIcon mStatusBarIcon = mock(StatusBarIcon.class);
@Before
public void setUp() {
mIconView = new StatusBarIconView(getContext(), "slot", null);
mStatusBarIcon = new StatusBarIcon(UserHandle.ALL, getContext().getPackageName(),
Icon.createWithResource(getContext(), R.drawable.ic_android), 0, 0, "");
}
@Test
public void testSetClearsGrayscale() {
mIconView.setTag(R.id.icon_is_grayscale, true);
mIconView.set(mStatusBarIcon);
assertNull(mIconView.getTag(R.id.icon_is_grayscale));
}
}