DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up usage of ConfigurationHelper.

Browse Source 
Bug: 32794064
Test: ./gradlew assemble
Change-Id: I7b92c5a6d846336c22b893fe228521bed239e337
PiperOrigin-RevId: 152181216
This commit is contained in:
Aurimas Liutikas 2017-04-04 21:35:21 +00:00 committed by Travis Collins
parent b140f8debc
commit 465ea656d0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/src/android/support/design/widget/FloatingActionButton.java
View File

@ -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);