diff options
4 files changed, 8 insertions, 1 deletions
diff --git a/library/main/src/com/android/setupwizardlib/TemplateLayout.java b/library/main/src/com/android/setupwizardlib/TemplateLayout.java index bd430db..d270091 100644 --- a/library/main/src/com/android/setupwizardlib/TemplateLayout.java +++ b/library/main/src/com/android/setupwizardlib/TemplateLayout.java @@ -103,6 +103,8 @@ public class TemplateLayout extends FrameLayout { * by this view but not currently added to the view hierarchy. e.g. recycler view or list view * headers that are not currently shown. */ + // Returning generic type is the common pattern used for findViewBy* methods + @SuppressWarnings("TypeParameterUnusedInFormals") public <T extends View> T findManagedViewById(int id) { return findViewById(id); } diff --git a/library/main/src/com/android/setupwizardlib/view/Illustration.java b/library/main/src/com/android/setupwizardlib/view/Illustration.java index b576174..c6968f8 100644 --- a/library/main/src/com/android/setupwizardlib/view/Illustration.java +++ b/library/main/src/com/android/setupwizardlib/view/Illustration.java @@ -137,7 +137,8 @@ public class Illustration extends FrameLayout { if (mAspectRatio != 0.0f) { int parentWidth = MeasureSpec.getSize(widthMeasureSpec); int illustrationHeight = (int) (parentWidth / mAspectRatio); - illustrationHeight -= illustrationHeight % mBaselineGridSize; + illustrationHeight = + (int) (illustrationHeight - (illustrationHeight % mBaselineGridSize)); setPadding(0, illustrationHeight, 0, 0); } if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { diff --git a/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java b/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java index b681dee..e8a021d 100644 --- a/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java +++ b/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java @@ -107,6 +107,8 @@ public class GlifRecyclerLayout extends GlifLayout { } @Override + // Returning generic type is the common pattern used for findViewBy* methods + @SuppressWarnings("TypeParameterUnusedInFormals") public <T extends View> T findManagedViewById(int id) { final View header = mRecyclerMixin.getHeader(); if (header != null) { diff --git a/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java index c5b5afc..6f3aed4 100644 --- a/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java +++ b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java @@ -127,6 +127,8 @@ public class SetupWizardRecyclerLayout extends SetupWizardLayout { } @Override + // Returning generic type is the common pattern used for findViewBy* methods + @SuppressWarnings("TypeParameterUnusedInFormals") public <T extends View> T findManagedViewById(int id) { final View header = mRecyclerMixin.getHeader(); if (header != null) { |