Merge "Fix IdentityBinaryExpression warnings in support library"
diff --git a/buildSrc/src/main/groovy/android/support/SupportLibraryPlugin.groovy b/buildSrc/src/main/groovy/android/support/SupportLibraryPlugin.groovy
index bbddad2..fce9193 100644
--- a/buildSrc/src/main/groovy/android/support/SupportLibraryPlugin.groovy
+++ b/buildSrc/src/main/groovy/android/support/SupportLibraryPlugin.groovy
@@ -172,7 +172,6 @@
'-Xep:TypeParameterUnusedInFormals:WARN',
'-Xep:MissingOverride:WARN',
'-Xep:ArrayToString:WARN',
- '-Xep:IdentityBinaryExpression:WARN',
'-Xep:MislabeledAndroidString:WARN',
'-Xep:SelfEquals:WARN',
'-Xep:RectIntersectReturnValueIgnored:WARN',
diff --git a/v17/leanback/src/android/support/v17/leanback/widget/DetailsOverviewLogoPresenter.java b/v17/leanback/src/android/support/v17/leanback/widget/DetailsOverviewLogoPresenter.java
index 22dba9c..f23acbc 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/DetailsOverviewLogoPresenter.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/DetailsOverviewLogoPresenter.java
@@ -94,7 +94,7 @@
ViewHolder vh = new ViewHolder(view);
ViewGroup.LayoutParams lp = view.getLayoutParams();
vh.setSizeFromDrawableIntrinsic(lp.width == ViewGroup.LayoutParams.WRAP_CONTENT
- && lp.width == ViewGroup.LayoutParams.WRAP_CONTENT);
+ && lp.height == ViewGroup.LayoutParams.WRAP_CONTENT);
return vh;
}
diff --git a/v7/palette/src/main/java/android/support/v7/graphics/Palette.java b/v7/palette/src/main/java/android/support/v7/graphics/Palette.java
index 0c35828..b7fb054 100644
--- a/v7/palette/src/main/java/android/support/v7/graphics/Palette.java
+++ b/v7/palette/src/main/java/android/support/v7/graphics/Palette.java
@@ -540,7 +540,7 @@
final int darkTitleAlpha = ColorUtils.calculateMinimumAlpha(
Color.BLACK, mRgb, MIN_CONTRAST_TITLE_TEXT);
- if (darkBodyAlpha != -1 && darkBodyAlpha != -1) {
+ if (darkBodyAlpha != -1 && darkTitleAlpha != -1) {
// If we found valid dark values, use them and return
mBodyTextColor = ColorUtils.setAlphaComponent(Color.BLACK, darkBodyAlpha);
mTitleTextColor = ColorUtils.setAlphaComponent(Color.BLACK, darkTitleAlpha);