cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

instrument: fix DrawableMatcher for varying contexts

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-06-20 22:32:55 +02:00
parent 675df57abd
commit 2a05e2a17b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/DrawableMatcher.java
View File

@@ -102,7 +102,7 @@ public class DrawableMatcher extends TypeSafeMatcher<View> {
} }
// if those are both bitmap drawables, compare their bitmaps (ignores color filters, which is what we want!) // if those are both bitmap drawables, compare their bitmaps (ignores color filters, which is what we want!)
if (mIgnoreFilters && drawable instanceof BitmapDrawable && expectedDrawable instanceof BitmapDrawable) { if (mIgnoreFilters && drawable instanceof BitmapDrawable && expectedDrawable instanceof BitmapDrawable) {
return ((BitmapDrawable) drawable).getBitmap().equals(((BitmapDrawable) expectedDrawable).getBitmap()); return ((BitmapDrawable) drawable).getBitmap().sameAs((((BitmapDrawable) expectedDrawable).getBitmap()));
} }
return expectedDrawable.getConstantState().equals(drawable.getConstantState()); return expectedDrawable.getConstantState().equals(drawable.getConstantState());
} }