From 1197065855cbb0ce6cbb85234df5bd67d7b81fab Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Wed, 2 May 2018 16:16:08 -0700
Subject: Change bottomsheet peek height.

Additionally, change the style of the bottom sheet to unbreak AOSP.

Bug: 79150335
Test: manual
PiperOrigin-RevId: 195169624
Change-Id: I86d2f5b7931b3c928252c5d5e1e6eef6973a35cd
---
 .../historyitemactions/HistoryItemActionBottomSheet.java       |  6 +++---
 .../dialer/historyitemactions/res/values-land/styles.xml       |  6 +-----
 .../android/dialer/historyitemactions/res/values/styles.xml    | 10 ++++++++--
 3 files changed, 12 insertions(+), 10 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 f90effc4c..e3e9e7a64 100644
--- a/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java
+++ b/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java
@@ -20,9 +20,9 @@ import android.content.Context;
 import android.content.res.ColorStateList;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.design.bottomsheet.BottomSheetBehavior;
-import android.support.design.bottomsheet.BottomSheetBehavior.BottomSheetCallback;
-import android.support.design.bottomsheet.BottomSheetDialog;
+import android.support.design.widget.BottomSheetBehavior;
+import android.support.design.widget.BottomSheetBehavior.BottomSheetCallback;
+import android.support.design.widget.BottomSheetDialog;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
diff --git a/java/com/android/dialer/historyitemactions/res/values-land/styles.xml b/java/com/android/dialer/historyitemactions/res/values-land/styles.xml
index af9c0d94d..bc727d073 100644
--- a/java/com/android/dialer/historyitemactions/res/values-land/styles.xml
+++ b/java/com/android/dialer/historyitemactions/res/values-land/styles.xml
@@ -15,11 +15,7 @@
  ~ limitations under the License
  -->
 <resources>
-  <style name="HistoryItemBottomSheet" parent="HistoryItemBottomSheet.Base">
-    <item name="bottomSheetStyle">@style/HistoryItemBottomSheet.BottomSheetStyle</item>
-  </style>
-
   <style name="HistoryItemBottomSheet.BottomSheetStyle" parent="Widget.Design.BottomSheet.Modal">
-    <item name="behavior_peekHeight">100dp</item>
+    <item name="behavior_peekHeight">206dp</item>
   </style>
 </resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values/styles.xml b/java/com/android/dialer/historyitemactions/res/values/styles.xml
index fbdfb7d60..ed3cf115a 100644
--- a/java/com/android/dialer/historyitemactions/res/values/styles.xml
+++ b/java/com/android/dialer/historyitemactions/res/values/styles.xml
@@ -15,12 +15,18 @@
  ~ limitations under the License
  -->
 <resources>
-  <style name="HistoryItemBottomSheet.Base" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
+  <style name="HistoryItemBottomSheet.Base" parent="Theme.Design.Light.BottomSheetDialog">
     <item name="android:windowDrawsSystemBarBackgrounds">false</item>
     <item name="android:windowTranslucentNavigation">false</item>
     <item name="android:windowTranslucentStatus">false</item>
     <item name="android:navigationBarColor">@color/background_dialer_white</item>
   </style>
 
-  <style name="HistoryItemBottomSheet" parent="HistoryItemBottomSheet.Base"/>
+  <style name="HistoryItemBottomSheet" parent="HistoryItemBottomSheet.Base">
+    <item name="bottomSheetStyle">@style/HistoryItemBottomSheet.BottomSheetStyle</item>
+  </style>
+
+  <style name="HistoryItemBottomSheet.BottomSheetStyle" parent="Widget.Design.BottomSheet.Modal">
+    <item name="behavior_peekHeight">405dp</item>
+  </style>
 </resources>
-- 
cgit v1.2.3