From 465ea656d098f0deae0e1abd908f7875f3763dd0 Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Tue, 4 Apr 2017 21:35:21 +0000
Subject: [PATCH] Clean up usage of ConfigurationHelper.

Bug: 32794064
Test: ./gradlew assemble
Change-Id: I7b92c5a6d846336c22b893fe228521bed239e337
PiperOrigin-RevId: 152181216
---
 .../android/support/design/widget/FloatingActionButton.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/src/android/support/design/widget/FloatingActionButton.java b/lib/src/android/support/design/widget/FloatingActionButton.java
index 2950973a8..ac291e098 100644
--- a/lib/src/android/support/design/widget/FloatingActionButton.java
+++ b/lib/src/android/support/design/widget/FloatingActionButton.java
@@ -35,7 +35,6 @@ import android.support.annotation.RestrictTo;
 import android.support.annotation.VisibleForTesting;
 import android.support.design.R;
 import android.support.design.widget.FloatingActionButtonImpl.InternalVisibilityChangedListener;
-import android.support.v4.content.res.ConfigurationHelper;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.AppCompatImageHelper;
 import android.util.AttributeSet;
@@ -436,8 +435,8 @@ public class FloatingActionButton extends VisibilityAwareImageButton {
     switch (size) {
       case SIZE_AUTO:
         // If we're set to auto, grab the size from resources and refresh
-        final int width = ConfigurationHelper.getScreenWidthDp(res);
-        final int height = ConfigurationHelper.getScreenHeightDp(res);
+        final int width = res.getConfiguration().screenWidthDp;
+        final int height = res.getConfiguration().screenHeightDp;
         return Math.max(width, height) < AUTO_MINI_LARGEST_SCREEN_WIDTH
             ? getSizeDimension(SIZE_MINI)
             : getSizeDimension(SIZE_NORMAL);