From 21b13e2975180744020b0fb8c150e4a74c45e30c Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Thu, 8 Feb 2018 10:44:50 -0800
Subject: Show icon and label for a spam number in the new call log.

Bug: 73077158
Test: CallLogEntryTextTest, GlidePhotoManagerImplTest, PhoneLookupInfoConsolidatorTest
PiperOrigin-RevId: 185017362
Change-Id: I113472482da2213d17a847054272a22249edc578
---
 .../contactphoto/NumberAttributeConverter.java     |  66 ---------------------
 .../res/drawable-xxxhdpi/ic_block_black_48dp.png   | Bin 2532 -> 0 bytes
 .../res/drawable/ic_block_grey_48dp.xml            |  17 ------
 3 files changed, 83 deletions(-)
 delete mode 100644 java/com/android/dialer/contactphoto/NumberAttributeConverter.java
 delete mode 100644 java/com/android/dialer/contactphoto/res/drawable-xxxhdpi/ic_block_black_48dp.png
 delete mode 100644 java/com/android/dialer/contactphoto/res/drawable/ic_block_grey_48dp.xml

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

diff --git a/java/com/android/dialer/contactphoto/NumberAttributeConverter.java b/java/com/android/dialer/contactphoto/NumberAttributeConverter.java
deleted file mode 100644
index d7bf9bda7..000000000
--- a/java/com/android/dialer/contactphoto/NumberAttributeConverter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.contactphoto;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.res.Resources;
-import android.net.Uri;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import com.android.dialer.NumberAttributes;
-
-/**
- * Convert photo information in {@link NumberAttributes} to an URI suitable for {@link
- * ContactPhotoManager}.
- *
- * <p>This class is temporary. The new photo manager should take NumberAttributes directly.
- */
-public final class NumberAttributeConverter {
-
-  /**
-   * Computes the photo URI from NumberAttributes.
-   *
-   * <p>The photo URI is shown in the quick contact badge in the main call log list or in the top
-   * item of the bottom sheet menu.
-   */
-  @Nullable
-  public static Uri getPhotoUri(Context context, NumberAttributes numberAttributes) {
-    if (numberAttributes.getIsBlocked()) {
-      return getResourceUri(context.getResources(), R.drawable.ic_block_grey_48dp);
-    } else {
-      return parseUri(numberAttributes.getPhotoUri());
-    }
-  }
-
-  @Nullable
-  private static Uri parseUri(@Nullable String uri) {
-    return TextUtils.isEmpty(uri) ? null : Uri.parse(uri);
-  }
-
-  private static Uri getResourceUri(Resources resources, @DrawableRes int drawable) {
-    return Uri.parse(
-        ContentResolver.SCHEME_ANDROID_RESOURCE
-            + "://"
-            + resources.getResourcePackageName(drawable)
-            + "/"
-            + resources.getResourceTypeName(drawable)
-            + "/"
-            + resources.getResourceEntryName(drawable));
-  }
-}
diff --git a/java/com/android/dialer/contactphoto/res/drawable-xxxhdpi/ic_block_black_48dp.png b/java/com/android/dialer/contactphoto/res/drawable-xxxhdpi/ic_block_black_48dp.png
deleted file mode 100644
index 1168bd8d5..000000000
Binary files a/java/com/android/dialer/contactphoto/res/drawable-xxxhdpi/ic_block_black_48dp.png and /dev/null differ
diff --git a/java/com/android/dialer/contactphoto/res/drawable/ic_block_grey_48dp.xml b/java/com/android/dialer/contactphoto/res/drawable/ic_block_grey_48dp.xml
deleted file mode 100644
index 42cfa99bd..000000000
--- a/java/com/android/dialer/contactphoto/res/drawable/ic_block_grey_48dp.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 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.
--->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_block_black_48dp"
-    android:tint="#757575" />
\ No newline at end of file
-- 
cgit v1.2.3