commit 1973b350bad5d14804c101ea9d31c213bc4bdfa8
author Dake Gu <dake@google.com> Wed Mar 22 17:48:49 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 22 17:48:49 2017 +0000
tree 10dfef54a16c3e40e40a89e9d9a932e49d783037
parent ed50d581ed7fa6c9ff2140df132bb7602fec9a34
parent 985d0981d78f9ea1602e5562fda5f08a2fa8748c

Merge "Leanback: fix regression caused by fixing error prone" into nyc-support-25.4-dev

v17/leanback/src/android/support/v17/leanback/widget/ItemAlignmentFacetHelper.java

diff --git a/v17/leanback/src/android/support/v17/leanback/widget/ItemAlignmentFacetHelper.java b/v17/leanback/src/android/support/v17/leanback/widget/ItemAlignmentFacetHelper.java
index b0e681a..a51d1ca 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/ItemAlignmentFacetHelper.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/ItemAlignmentFacetHelper.java
@@ -55,8 +55,7 @@
                 }
             }
             if (facet.mOffsetPercent != ITEM_ALIGN_OFFSET_PERCENT_DISABLED) {
-                alignPos += Math.round(
-                        ((view == itemView ? p.getOpticalWidth(view) : view.getWidth())
+                alignPos += (int) (((view == itemView ? p.getOpticalWidth(view) : view.getWidth())
                         * facet.mOffsetPercent) / 100f);
             }
             if (itemView != view) {
@@ -75,8 +74,7 @@
                 }
             }
             if (facet.mOffsetPercent != ITEM_ALIGN_OFFSET_PERCENT_DISABLED) {
-                alignPos += Math.round(
-                        ((view == itemView ? p.getOpticalHeight(view) : view.getHeight())
+                alignPos += (int) (((view == itemView ? p.getOpticalHeight(view) : view.getHeight())
                         * facet.mOffsetPercent) / 100f);
             }
             if (itemView != view) {