From 84a6d29f889148c49db278f0682bbdf8d8466b1f Mon Sep 17 00:00:00 2001
From: twyen <twyen@google.com>
Date: Mon, 25 Jun 2018 15:25:35 -0700
Subject: Move contacts.commons.R to dialer.contacts.resources

This reduces dependency on contacts.common which is full of things that should not be there.

Ideally resources inside dialer.contacts.resources should be individually moved to appropriate locations, but the resources are too large to work with.

TEST=TAP
Test: TAP
PiperOrigin-RevId: 202029832
Change-Id: I95bfcb59799b9c3640de03ad0680624fc1b2c3a3
---
 java/com/android/contacts/common/util/AccountFilterUtil.java     | 2 +-
 java/com/android/contacts/common/util/ContactDisplayUtils.java   | 2 +-
 java/com/android/contacts/common/util/ContactListViewUtils.java  | 2 +-
 java/com/android/contacts/common/util/MaterialColorMapUtils.java | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'java/com/android/contacts/common/util')

diff --git a/java/com/android/contacts/common/util/AccountFilterUtil.java b/java/com/android/contacts/common/util/AccountFilterUtil.java
index 25f937c5e..45876354d 100644
--- a/java/com/android/contacts/common/util/AccountFilterUtil.java
+++ b/java/com/android/contacts/common/util/AccountFilterUtil.java
@@ -19,8 +19,8 @@ package com.android.contacts.common.util;
 import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
-import com.android.contacts.common.R;
 import com.android.contacts.common.list.ContactListFilter;
+import com.android.dialer.contacts.resources.R;
 
 /** Utility class for account filter manipulation. */
 public class AccountFilterUtil {
diff --git a/java/com/android/contacts/common/util/ContactDisplayUtils.java b/java/com/android/contacts/common/util/ContactDisplayUtils.java
index 967395af4..86d20bca0 100644
--- a/java/com/android/contacts/common/util/ContactDisplayUtils.java
+++ b/java/com/android/contacts/common/util/ContactDisplayUtils.java
@@ -27,8 +27,8 @@ import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.TtsSpan;
 import android.util.Patterns;
-import com.android.contacts.common.R;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.contacts.resources.R;
 import java.util.Objects;
 
 /** Methods for handling various contact data labels. */
diff --git a/java/com/android/contacts/common/util/ContactListViewUtils.java b/java/com/android/contacts/common/util/ContactListViewUtils.java
index 278c27d5c..924789b16 100644
--- a/java/com/android/contacts/common/util/ContactListViewUtils.java
+++ b/java/com/android/contacts/common/util/ContactListViewUtils.java
@@ -19,7 +19,7 @@ package com.android.contacts.common.util;
 import android.content.res.Resources;
 import android.view.View;
 import android.widget.ListView;
-import com.android.contacts.common.R;
+import com.android.dialer.contacts.resources.R;
 import com.android.dialer.util.ViewUtil;
 
 /** Utilities for configuring ListViews with a card background. */
diff --git a/java/com/android/contacts/common/util/MaterialColorMapUtils.java b/java/com/android/contacts/common/util/MaterialColorMapUtils.java
index bd32faa51..ea8c5fc69 100644
--- a/java/com/android/contacts/common/util/MaterialColorMapUtils.java
+++ b/java/com/android/contacts/common/util/MaterialColorMapUtils.java
@@ -29,9 +29,10 @@ public class MaterialColorMapUtils {
 
   public MaterialColorMapUtils(Resources resources) {
     sPrimaryColors =
-        resources.obtainTypedArray(com.android.contacts.common.R.array.letter_tile_colors);
+        resources.obtainTypedArray(com.android.dialer.lettertile.R.array.letter_tile_colors);
     sSecondaryColors =
-        resources.obtainTypedArray(com.android.contacts.common.R.array.letter_tile_colors_dark);
+        resources.obtainTypedArray(
+            com.android.dialer.contacts.resources.R.array.letter_tile_colors_dark);
   }
 
   /**
-- 
cgit v1.2.3