From 3ed2e987f1908db5c2d06e059bad27a2135a4bdb Mon Sep 17 00:00:00 2001 From: miguely Date: Wed, 20 Sep 2017 15:10:31 -0400 Subject: [PATCH] Adding final qualifiers to fix compiler error about these variables being used in inner classes. PiperOrigin-RevId: 169430210 --- .../support/design/widget/IndicatorViewController.java | 8 ++++---- .../widget/transformation/ExpandableBehavior.java | 6 +++--- .../transformation/FabTransformationBehavior.java | 10 +++++----- .../transformation/FabTransformationScrimBehavior.java | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/src/android/support/design/widget/IndicatorViewController.java b/lib/src/android/support/design/widget/IndicatorViewController.java index 58cdff681..54ba68d9a 100644 --- a/lib/src/android/support/design/widget/IndicatorViewController.java +++ b/lib/src/android/support/design/widget/IndicatorViewController.java @@ -188,8 +188,8 @@ final class IndicatorViewController { } private void updateCaptionViewsVisibility( - @CaptionDisplayState int captionToHide, - @CaptionDisplayState int captionToShow, + final @CaptionDisplayState int captionToHide, + final @CaptionDisplayState int captionToShow, boolean animate) { if (animate) { @@ -214,8 +214,8 @@ final class IndicatorViewController { captionToShow); captionAnimator.playTogether(captionAnimatorList); - TextView captionViewToHide = getCaptionViewFromDisplayState(captionToHide); - TextView captionViewToShow = getCaptionViewFromDisplayState(captionToShow); + final TextView captionViewToHide = getCaptionViewFromDisplayState(captionToHide); + final TextView captionViewToShow = getCaptionViewFromDisplayState(captionToShow); captionAnimator.addListener( new AnimatorListenerAdapter() { diff --git a/lib/src/android/support/design/widget/transformation/ExpandableBehavior.java b/lib/src/android/support/design/widget/transformation/ExpandableBehavior.java index 889e1a6f7..927eb1242 100644 --- a/lib/src/android/support/design/widget/transformation/ExpandableBehavior.java +++ b/lib/src/android/support/design/widget/transformation/ExpandableBehavior.java @@ -84,12 +84,12 @@ public abstract class ExpandableBehavior extends Behavior { @CallSuper @Override - public boolean onLayoutChild(CoordinatorLayout parent, View child, int layoutDirection) { + public boolean onLayoutChild(CoordinatorLayout parent, final View child, int layoutDirection) { if (!ViewCompat.isLaidOut(child)) { - ExpandableWidget dep = findExpandableWidget(parent, child); + final ExpandableWidget dep = findExpandableWidget(parent, child); if (dep != null && didStateChange(dep.isExpanded())) { currentState = dep.isExpanded() ? STATE_EXPANDED : STATE_COLLAPSED; - @State int expectedState = currentState; + @State final int expectedState = currentState; child .getViewTreeObserver() .addOnPreDrawListener( diff --git a/lib/src/android/support/design/widget/transformation/FabTransformationBehavior.java b/lib/src/android/support/design/widget/transformation/FabTransformationBehavior.java index 9b53e267a..e70960bd6 100644 --- a/lib/src/android/support/design/widget/transformation/FabTransformationBehavior.java +++ b/lib/src/android/support/design/widget/transformation/FabTransformationBehavior.java @@ -108,7 +108,7 @@ public abstract class FabTransformationBehavior extends ExpandableTransformation @NonNull @Override protected AnimatorSet onCreateExpandedStateChangeAnimation( - View dependency, View child, boolean expanded, boolean isAnimating) { + final View dependency, final View child, final boolean expanded, boolean isAnimating) { FabTransformationSpec spec = onCreateMotionSpec(dependency, child, expanded); List animations = new ArrayList<>(); @@ -274,7 +274,7 @@ public abstract class FabTransformationBehavior extends ExpandableTransformation private void createIconFadeAnimation( View dependency, - View child, + final View child, boolean expanded, boolean currentlyAnimating, FabTransformationSpec spec, @@ -284,9 +284,9 @@ public abstract class FabTransformationBehavior extends ExpandableTransformation return; } - CircularRevealWidget circularRevealChild = (CircularRevealWidget) child; + final CircularRevealWidget circularRevealChild = (CircularRevealWidget) child; ImageView dependencyImageView = (ImageView) dependency; - Drawable icon = dependencyImageView.getDrawable(); + final Drawable icon = dependencyImageView.getDrawable(); ObjectAnimator animator; @@ -339,7 +339,7 @@ public abstract class FabTransformationBehavior extends ExpandableTransformation if (!(child instanceof CircularRevealWidget)) { return; } - CircularRevealWidget circularRevealChild = (CircularRevealWidget) child; + final CircularRevealWidget circularRevealChild = (CircularRevealWidget) child; float revealCenterX = calculateRevealCenterX(dependency, child, spec.positioning); float revealCenterY = calculateRevealCenterY(dependency, child, spec.positioning); diff --git a/lib/src/android/support/design/widget/transformation/FabTransformationScrimBehavior.java b/lib/src/android/support/design/widget/transformation/FabTransformationScrimBehavior.java index 41ac59feb..d020d6399 100644 --- a/lib/src/android/support/design/widget/transformation/FabTransformationScrimBehavior.java +++ b/lib/src/android/support/design/widget/transformation/FabTransformationScrimBehavior.java @@ -68,7 +68,7 @@ public class FabTransformationScrimBehavior extends ExpandableTransformationBeha @NonNull @Override protected AnimatorSet onCreateExpandedStateChangeAnimation( - View dependency, View child, boolean expanded, boolean isAnimating) { + View dependency, final View child, final boolean expanded, boolean isAnimating) { List animations = new ArrayList<>(); List listeners = new ArrayList<>();