aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-06-20 22:32:55 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-06-20 22:32:55 +0200
commit2a05e2a17b02866bbded6cbed8bb04a4c52f1560 (patch)
tree9c4825f4d29fbfedfb1c27303eef23a48a612857 /OpenKeychain
parent675df57abdbf12fc12a5ef06bd727959680bfe38 (diff)
downloadopen-keychain-2a05e2a17b02866bbded6cbed8bb04a4c52f1560.tar.gz
open-keychain-2a05e2a17b02866bbded6cbed8bb04a4c52f1560.tar.bz2
open-keychain-2a05e2a17b02866bbded6cbed8bb04a4c52f1560.zip
instrument: fix DrawableMatcher for varying contexts
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/DrawableMatcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/DrawableMatcher.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/DrawableMatcher.java
index 761fb8e0b..da2ff87d9 100644
--- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/DrawableMatcher.java
+++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/DrawableMatcher.java
@@ -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 (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());
}