From 988a7e99fcbd3aad8503889a550c795b80c31da7 Mon Sep 17 00:00:00 2001 From: linyuh Date: Fri, 15 Jun 2018 14:15:24 -0700 Subject: Fix an AOSP build error caused by bottom sheet states. Test: Existing tests PiperOrigin-RevId: 200771998 Change-Id: Icb2b9bc13dfb03d92c389124e20883952be60821 --- .../historyitemactions/HistoryItemActionBottomSheet.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'java/com/android/dialer/historyitemactions') diff --git a/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java b/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java index 9653f55ed..9bc657067 100644 --- a/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java +++ b/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java @@ -35,6 +35,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import com.android.dialer.common.Assert; +import com.android.dialer.compat.android.support.design.bottomsheet.BottomSheetStateCompat; import com.android.dialer.theme.base.ThemeComponent; import com.android.dialer.widget.ContactPhotoView; import com.google.common.collect.ImmutableSet; @@ -77,7 +78,7 @@ public class HistoryItemActionBottomSheet extends BottomSheetDialog implements O // *can* be expanded to full screen. contactLayout.setElevation( background.getHeight() == bottomSheet.getHeight() - && behavior.getState() == BottomSheetBehavior.STATE_EXPANDED + && behavior.getState() == BottomSheetStateCompat.STATE_EXPANDED ? getContext() .getResources() .getDimensionPixelSize(R.dimen.contact_actions_header_elevation) @@ -146,7 +147,7 @@ public class HistoryItemActionBottomSheet extends BottomSheetDialog implements O if (isTouchExplorationEnabled()) { BottomSheetBehavior behavior = BottomSheetBehavior.from(findViewById(android.support.design.R.id.design_bottom_sheet)); - behavior.setState(BottomSheetBehavior.STATE_EXPANDED); + behavior.setState(BottomSheetStateCompat.STATE_EXPANDED); } } @@ -171,10 +172,10 @@ public class HistoryItemActionBottomSheet extends BottomSheetDialog implements O ImmutableSet statesToCancelBottomSheet = isTouchExplorationEnabled() ? ImmutableSet.of( - BottomSheetBehavior.STATE_COLLAPSED, - BottomSheetBehavior.STATE_HIDDEN, - BottomSheetBehavior.STATE_HALF_EXPANDED) - : ImmutableSet.of(BottomSheetBehavior.STATE_HIDDEN); + BottomSheetStateCompat.STATE_COLLAPSED, + BottomSheetStateCompat.STATE_HIDDEN, + BottomSheetStateCompat.STATE_HALF_EXPANDED) + : ImmutableSet.of(BottomSheetStateCompat.STATE_HIDDEN); if (statesToCancelBottomSheet.contains(newState)) { cancel(); -- cgit v1.2.3