From d6180d452cc6085f64c25d487bfaee3a614dd67a Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Mon, 19 Mar 2018 20:09:53 -0700
Subject: Make the top row of the bottom sheet not clickable.

Test: Existing tests
PiperOrigin-RevId: 189683790
Change-Id: I0209e7fa839175041da29e9a6d8a590133121376
---
 .../dialer/calllog/ui/menu/BottomSheetHeader.java  | 42 ++++++++++++++++++++
 .../dialer/calllog/ui/menu/NewCallLogMenu.java     |  2 +-
 .../dialer/calllog/ui/menu/PrimaryAction.java      | 45 ----------------------
 3 files changed, 43 insertions(+), 46 deletions(-)
 create mode 100644 java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java
 delete mode 100644 java/com/android/dialer/calllog/ui/menu/PrimaryAction.java

(limited to 'java/com/android/dialer/calllog')

diff --git a/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java b/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java
new file mode 100644
index 000000000..d348541d7
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 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.calllog.ui.menu;
+
+import android.content.Context;
+import android.provider.CallLog.Calls;
+import com.android.dialer.calllog.model.CoalescedRow;
+import com.android.dialer.calllogutils.CallLogEntryText;
+import com.android.dialer.calllogutils.NumberAttributesConverter;
+import com.android.dialer.historyitemactions.HistoryItemBottomSheetHeaderInfo;
+
+/** Configures the top row in the bottom sheet. */
+final class BottomSheetHeader {
+
+  static HistoryItemBottomSheetHeaderInfo fromRow(Context context, CoalescedRow row) {
+    return HistoryItemBottomSheetHeaderInfo.newBuilder()
+        .setNumber(row.getNumber())
+        .setPhotoInfo(
+            NumberAttributesConverter.toPhotoInfoBuilder(row.getNumberAttributes())
+                .setFormattedNumber(row.getFormattedNumber())
+                .setIsVideo((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO)
+                .build())
+        .setPrimaryText(CallLogEntryText.buildPrimaryText(context, row).toString())
+        .setSecondaryText(
+            CallLogEntryText.buildSecondaryTextForBottomSheet(context, row).toString())
+        .build();
+  }
+}
diff --git a/java/com/android/dialer/calllog/ui/menu/NewCallLogMenu.java b/java/com/android/dialer/calllog/ui/menu/NewCallLogMenu.java
index 5be19ce0c..78354caac 100644
--- a/java/com/android/dialer/calllog/ui/menu/NewCallLogMenu.java
+++ b/java/com/android/dialer/calllog/ui/menu/NewCallLogMenu.java
@@ -36,7 +36,7 @@ public final class NewCallLogMenu {
     return view -> {
       HistoryItemActionBottomSheet.show(
           context,
-          PrimaryAction.fromRow(context, row),
+          BottomSheetHeader.fromRow(context, row),
           Modules.fromRow(context, row),
           glidePhotoManager);
 
diff --git a/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java b/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java
deleted file mode 100644
index 279869d70..000000000
--- a/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2017 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.calllog.ui.menu;
-
-import android.content.Context;
-import android.provider.CallLog.Calls;
-import com.android.dialer.calllog.model.CoalescedRow;
-import com.android.dialer.calllogutils.CallLogEntryText;
-import com.android.dialer.calllogutils.CallLogIntents;
-import com.android.dialer.calllogutils.NumberAttributesConverter;
-import com.android.dialer.historyitemactions.HistoryItemPrimaryActionInfo;
-
-/** Configures the primary action row (top row) for the bottom sheet. */
-final class PrimaryAction {
-
-  static HistoryItemPrimaryActionInfo fromRow(Context context, CoalescedRow row) {
-    CharSequence primaryText = CallLogEntryText.buildPrimaryText(context, row);
-
-    return HistoryItemPrimaryActionInfo.builder()
-        .setNumber(row.getNumber())
-        .setPhotoInfo(
-            NumberAttributesConverter.toPhotoInfoBuilder(row.getNumberAttributes())
-                .setFormattedNumber(row.getFormattedNumber())
-                .setIsVideo((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO)
-                .build())
-        .setPrimaryText(primaryText)
-        .setSecondaryText(CallLogEntryText.buildSecondaryTextForBottomSheet(context, row))
-        .setIntent(CallLogIntents.getCallBackIntent(context, row))
-        .build();
-  }
-}
-- 
cgit v1.2.3