diff options
author | linyuh <linyuh@google.com> | 2018-06-15 14:15:24 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-18 13:21:18 -0700 |
commit | 988a7e99fcbd3aad8503889a550c795b80c31da7 (patch) | |
tree | 3eb8cc299ab22bd564a4f7760d37a2e224313745 /java/com/android/dialer/historyitemactions | |
parent | 61dc939969bce0a6246deb7109dc5dc64cd84942 (diff) |
Fix an AOSP build error caused by bottom sheet states.
Test: Existing tests
PiperOrigin-RevId: 200771998
Change-Id: Icb2b9bc13dfb03d92c389124e20883952be60821
Diffstat (limited to 'java/com/android/dialer/historyitemactions')
-rw-r--r-- | java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java | 13 |
1 files changed, 7 insertions, 6 deletions
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<View> 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<Integer> 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(); |