Skip to content

Change the getButtonDrawable method to use the compat version of its counterpart #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2020
Merged

Change the getButtonDrawable method to use the compat version of its counterpart #529

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package com.google.android.flexbox
import android.view.View
import android.widget.CheckBox
import android.widget.TextView
import androidx.core.widget.CompoundButtonCompat
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import com.google.android.flexbox.test.FlexboxTestActivity
Expand Down Expand Up @@ -428,7 +429,7 @@ class FlexboxHelperTest {

// CompoundButton will use its ButtonDrawable minWidth to determine its size when
// no minimum width is set on it.
val drawableMinWidth = view1.buttonDrawable!!.minimumWidth
val drawableMinWidth = CompoundButtonCompat.getButtonDrawable(view1)!!.minimumWidth
val expectedTextWidth = containerWidth - drawableMinWidth
assertThat(view1.measuredWidth, `is`(drawableMinWidth))
assertThat(view2.measuredWidth, `is`(expectedTextWidth))
Expand Down