From a0df9f7f52b4d7f926581f30bd0a7774a6abac43 Mon Sep 17 00:00:00 2001 From: Zachary Heidepriem Date: Wed, 11 Oct 2017 16:03:06 -0700 Subject: Added basic bottom sheet to new call log. Also added ability to click on row to call. Required plumbing through the original phone number and phone account info through AnnotatedCallLog and CoalescedAnnotatedCallLog, so that clicking to dial doesn't require an additional lookup. Required some refactoring: -created autovalue for CoalescedRow. -created autovalue for ContactPrimaryActionInfo and use it in ContactActionBottomSheet -moved logic for building primary and secondary text into CallLogUtils so it can be shared between call log list and bottom sheets -moved clipboard logic to own package for copying numbers Bug: 34672501 Test: unit PiperOrigin-RevId: 171760252 Change-Id: I645d89974460b611c1d9668c3ca3e50a716c7f8f --- .../android/contacts/common/ClipboardUtils.java | 53 ---------------------- .../android/contacts/common/res/values/strings.xml | 3 -- 2 files changed, 56 deletions(-) delete mode 100644 java/com/android/contacts/common/ClipboardUtils.java (limited to 'java/com/android/contacts/common') diff --git a/java/com/android/contacts/common/ClipboardUtils.java b/java/com/android/contacts/common/ClipboardUtils.java deleted file mode 100644 index 3d7683941..000000000 --- a/java/com/android/contacts/common/ClipboardUtils.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2012 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.contacts.common; - -import android.content.ClipData; -import android.content.ClipboardManager; -import android.content.Context; -import android.text.TextUtils; -import android.widget.Toast; - -public class ClipboardUtils { - - private ClipboardUtils() {} - - /** - * Copy a text to clipboard. - * - * @param context Context - * @param label Label to show to the user describing this clip. - * @param text Text to copy. - * @param showToast If {@code true}, a toast is shown to the user. - */ - public static void copyText( - Context context, CharSequence label, CharSequence text, boolean showToast) { - if (TextUtils.isEmpty(text)) { - return; - } - - ClipboardManager clipboardManager = - (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); - ClipData clipData = ClipData.newPlainText(label == null ? "" : label, text); - clipboardManager.setPrimaryClip(clipData); - - if (showToast) { - String toastText = context.getString(R.string.toast_text_copied); - Toast.makeText(context, toastText, Toast.LENGTH_SHORT).show(); - } - } -} diff --git a/java/com/android/contacts/common/res/values/strings.xml b/java/com/android/contacts/common/res/values/strings.xml index df8d70fc3..dbe97ea39 100644 --- a/java/com/android/contacts/common/res/values/strings.xml +++ b/java/com/android/contacts/common/res/values/strings.xml @@ -16,9 +16,6 @@ --> - - Text copied - Call %s -- cgit v1.2.3