From 41f5c0c37110da463ef2dec9f4f5bdcdd4bcd2f1 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Tue, 1 May 2018 11:31:45 -0700 Subject: Updated bottomsheet to be scrollable. Follow-up CLs will include: - white bottom nav - setting status bar color when expanded, translucent otherwise - automatically dismissing the bottomsheet onPause in calllog/vvm Bug: 73495458,77761183,77812338,77816530,77833456 Test: manual PiperOrigin-RevId: 194967761 Change-Id: Iea81035efd06ae7692950ca1f11757b7d9ebfd1c --- java/com/android/dialer/speeddial/SpeedDialFragment.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'java/com/android/dialer/speeddial') diff --git a/java/com/android/dialer/speeddial/SpeedDialFragment.java b/java/com/android/dialer/speeddial/SpeedDialFragment.java index 17591aa6c..c1745990d 100644 --- a/java/com/android/dialer/speeddial/SpeedDialFragment.java +++ b/java/com/android/dialer/speeddial/SpeedDialFragment.java @@ -80,7 +80,7 @@ import java.util.List; public class SpeedDialFragment extends Fragment { private final SpeedDialHeaderListener headerListener = new SpeedDialFragmentHeaderListener(); - private final SuggestedContactsListener suggestedListener = new SpeedDialSuggestedListener(); + private final SpeedDialSuggestedListener suggestedListener = new SpeedDialSuggestedListener(); private ContextMenu contextMenu; private FrameLayout contextMenuBackground; @@ -214,6 +214,7 @@ public class SpeedDialFragment extends Fragment { }), new DefaultFutureCallback<>(), DialerExecutorComponent.get(getContext()).backgroundExecutor()); + suggestedListener.onPause(); } @Override @@ -313,6 +314,8 @@ public class SpeedDialFragment extends Fragment { private final class SpeedDialSuggestedListener implements SuggestedContactsListener { + private HistoryItemActionBottomSheet bottomSheet; + @Override public void onOverFlowMenuClicked( SpeedDialUiItem speedDialUiItem, HistoryItemBottomSheetHeaderInfo headerInfo) { @@ -364,7 +367,7 @@ public class SpeedDialFragment extends Fragment { R.string.contact_menu_contact_info, R.drawable.context_menu_contact_icon)); - HistoryItemActionBottomSheet.show(getContext(), headerInfo, modules); + bottomSheet = HistoryItemActionBottomSheet.show(getContext(), headerInfo, modules); } @Override @@ -430,6 +433,12 @@ public class SpeedDialFragment extends Fragment { return false; } } + + public void onPause() { + if (bottomSheet != null && bottomSheet.isShowing()) { + bottomSheet.dismiss(); + } + } } private static final class SpeedDialContextMenuItemListener implements ContextMenuItemListener { -- cgit v1.2.3