From 988a7e99fcbd3aad8503889a550c795b80c31da7 Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
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
---
 .../design/bottomsheet/BottomSheetStateCompat.java | 43 ++++++++++++++++++++++
 .../HistoryItemActionBottomSheet.java              | 13 ++++---
 2 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 java/com/android/dialer/compat/android/support/design/bottomsheet/BottomSheetStateCompat.java

diff --git a/java/com/android/dialer/compat/android/support/design/bottomsheet/BottomSheetStateCompat.java b/java/com/android/dialer/compat/android/support/design/bottomsheet/BottomSheetStateCompat.java
new file mode 100644
index 000000000..d7079d461
--- /dev/null
+++ b/java/com/android/dialer/compat/android/support/design/bottomsheet/BottomSheetStateCompat.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.compat.android.support.design.bottomsheet;
+
+import android.support.design.widget.BottomSheetBehavior;
+
+/** Provides access to bottom sheet states. */
+public final class BottomSheetStateCompat {
+
+  /** The bottom sheet is dragging. */
+  public static final int STATE_DRAGGING = BottomSheetBehavior.STATE_DRAGGING;
+
+  /** The bottom sheet is settling. */
+  public static final int STATE_SETTLING = BottomSheetBehavior.STATE_SETTLING;
+
+  /** The bottom sheet is expanded. */
+  public static final int STATE_EXPANDED = BottomSheetBehavior.STATE_EXPANDED;
+
+  /** The bottom sheet is collapsed. */
+  public static final int STATE_COLLAPSED = BottomSheetBehavior.STATE_COLLAPSED;
+
+  /** The bottom sheet is hidden. */
+  public static final int STATE_HIDDEN = BottomSheetBehavior.STATE_HIDDEN;
+
+  /** The bottom sheet is half-expanded (not public yet). */
+  public static final int STATE_HALF_EXPANDED = 6;
+
+  private BottomSheetStateCompat() {}
+}
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();
-- 
cgit v1.2.3