From 49233d182157f25e03e4588977fe42560e17ddfa Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Wed, 30 Nov 2016 05:00:14 +0000 Subject: [PATCH] Move support libs to use ViewCompat.offset* methods am: a5c36708f8 Change-Id: Ib0a9f28bb7de3453e1252d5a6cd41ef90500a13d GitOrigin-RevId=1ea66d357aad81df357bd44375fed026435b3ebd PiperOrigin-RevId: 140563761 --- src/android/support/design/widget/CoordinatorLayout.java | 4 ++-- .../support/design/widget/FloatingActionButton.java | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/android/support/design/widget/CoordinatorLayout.java b/src/android/support/design/widget/CoordinatorLayout.java index 4dcce62f0..db9eede98 100644 --- a/src/android/support/design/widget/CoordinatorLayout.java +++ b/src/android/support/design/widget/CoordinatorLayout.java @@ -1495,10 +1495,10 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen final int dy = desiredChildRect.top - childRect.top; if (dx != 0) { - child.offsetLeftAndRight(dx); + ViewCompat.offsetLeftAndRight(child, dx); } if (dy != 0) { - child.offsetTopAndBottom(dy); + ViewCompat.offsetTopAndBottom(child, dy); } if (changed) { diff --git a/src/android/support/design/widget/FloatingActionButton.java b/src/android/support/design/widget/FloatingActionButton.java index eed92f015..e000656f2 100644 --- a/src/android/support/design/widget/FloatingActionButton.java +++ b/src/android/support/design/widget/FloatingActionButton.java @@ -788,8 +788,12 @@ public class FloatingActionButton extends VisibilityAwareImageButton { offsetTB = -padding.top; } - fab.offsetTopAndBottom(offsetTB); - fab.offsetLeftAndRight(offsetLR); + if (offsetTB != 0) { + ViewCompat.offsetTopAndBottom(fab, offsetTB); + } + if (offsetLR != 0) { + ViewCompat.offsetLeftAndRight(fab, offsetLR); + } } } }