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

Merge "Show mobile signal strength in QS edit panel" into oc-mr1-dev

Browse Source 
am: a76a1e8842

Change-Id: Icb107684248f324722ce36da3ec63b4531ddf49f
This commit is contained in:
Evan Laird
2017-09-14 18:52:53 +00:00
committed by android-build-merger
parent a76dc389ee a76a1e8842
commit 9ccc1dcd4d
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/qs/tileimpl/SlashImageView.java
View File

@@ -48,6 +48,7 @@ public class SlashImageView extends ImageView {
mSlash = null;
super.setImageDrawable(null);
} else if (mSlash == null) {
setImageLevel(drawable.getLevel());
super.setImageDrawable(drawable);
} else {
mSlash.setAnimationEnabled(mAnimationEnabled);

13
packages/SystemUI/tests/src/com/android/systemui/qs/SlashImageViewTest.java
View File

@@ -76,6 +76,19 @@ public class SlashImageViewTest extends SysuiTestCase {
assertTrue(mSlashView.getSlashDrawable() == null);
}
@Test
public void testSetImageDrawableUsesDrawableLevel() {
SlashImageView iv = new SlashImageView(mContext);
Drawable mockDrawable = mock(Drawable.class);
mockDrawable.setLevel(2);
assertTrue(mockDrawable.getLevel() == 2);
iv.setImageDrawable(mockDrawable);
// Make sure setting the drawable didn't reset its level to 0
assertTrue(mockDrawable.getLevel() == 2);
}
// Expose getSlashDrawable
private static class TestableSlashImageView extends SlashImageView {
TestableSlashImageView(Context c) {