Remove ui dependencies on car support lib.

We're removing the ui components from the car support
library so make the dialer depend on the copies that
have been added to the stream-ui-lib.

Bug: 33210228
Test: Booted and verified that the dialer looks ok.
Change-Id: Ib147e72650f5b76e2ca23e7f01d7b3501323df79

9 files changed, 11 insertions, 16 deletions

diff --git a/Android.mk b/Android.mk
index 6a122e7d..db7775a5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,9 +20,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-include packages/apps/Car/libs/car-stream-ui-lib/car-stream-ui-lib.mk
-include packages/apps/Car/libs/car-apps-common/car-apps-common.mk
-
 LOCAL_PACKAGE_NAME := CarDialerApp
 
 LOCAL_OVERRIDES_PACKAGES := Dialer
@@ -37,7 +34,8 @@ LOCAL_PRIVILEGED_MODULE := true
 
 LOCAL_DEX_PREOPT := false
 
-include packages/services/Car/car-support-lib/car-support.mk
+include packages/apps/Car/libs/car-stream-ui-lib/car-stream-ui-lib.mk
+include packages/apps/Car/libs/car-apps-common/car-apps-common.mk
 
 include $(BUILD_PACKAGE)
 
diff --git a/res/layout/no_hfp.xml b/res/layout/no_hfp.xml
index 831dd60b..1d453f18 100644
--- a/res/layout/no_hfp.xml
+++ b/res/layout/no_hfp.xml
@@ -44,10 +44,7 @@
             android:layout_marginTop="32dp"
             android:layout_marginRight="132dp"
             android:text="@string/no_hfp"
-            android:fontFamily="sans-serif-condensed"
-            android:textStyle="normal"
-            android:textSize="@dimen/car_body2_size"
-            android:textColor="@color/car_title_light"
+            style="@style/CarBody2.Light"
             android:maxLines="3" />
     </LinearLayout>
 </FrameLayout>
diff --git a/src/com/android/car/dialer/CallLogListingTask.java b/src/com/android/car/dialer/CallLogListingTask.java
index 54607f54..171bf241 100644
--- a/src/com/android/car/dialer/CallLogListingTask.java
+++ b/src/com/android/car/dialer/CallLogListingTask.java
@@ -23,11 +23,11 @@ import android.graphics.Bitmap;
 import android.os.AsyncTask;
 import android.provider.CallLog;
 import android.support.annotation.NonNull;
-import android.support.car.ui.CircleBitmapDrawable;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 
+import com.android.car.apps.common.CircleBitmapDrawable;
 import com.android.car.apps.common.LetterTileDrawable;
 import com.android.car.dialer.telecom.PhoneLoader;
 import com.android.car.dialer.telecom.TelecomUtils;
diff --git a/src/com/android/car/dialer/CallLogViewHolder.java b/src/com/android/car/dialer/CallLogViewHolder.java
index d8d2a5a4..c4fd6878 100644
--- a/src/com/android/car/dialer/CallLogViewHolder.java
+++ b/src/com/android/car/dialer/CallLogViewHolder.java
@@ -15,11 +15,11 @@
  */
 package com.android.car.dialer;
 
-import android.support.car.ui.CarListItemViewHolder;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import com.android.car.view.CarListItemViewHolder;
 
 public class CallLogViewHolder extends CarListItemViewHolder {
     public View card;
diff --git a/src/com/android/car/dialer/DialerFragment.java b/src/com/android/car/dialer/DialerFragment.java
index b3f42ca8..edf163a4 100644
--- a/src/com/android/car/dialer/DialerFragment.java
+++ b/src/com/android/car/dialer/DialerFragment.java
@@ -20,7 +20,6 @@ import android.media.AudioManager;
 import android.media.ToneGenerator;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.car.ui.FabDrawable;
 import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.util.ArrayMap;
@@ -30,6 +29,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.android.car.apps.common.FabDrawable;
 import com.android.car.dialer.telecom.TelecomUtils;
 import com.android.car.dialer.telecom.UiCallManager;
 import com.android.car.dialer.telecom.UiCallManager.CallListener;
diff --git a/src/com/android/car/dialer/OngoingCallFragment.java b/src/com/android/car/dialer/OngoingCallFragment.java
index 988812c9..a01b5b1b 100644
--- a/src/com/android/car/dialer/OngoingCallFragment.java
+++ b/src/com/android/car/dialer/OngoingCallFragment.java
@@ -21,8 +21,6 @@ import android.content.res.Resources;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.car.ui.CircleBitmapDrawable;
-import android.support.car.ui.FabDrawable;
 import android.support.v4.app.Fragment;
 import android.telecom.Call;
 import android.telecom.CallAudioState;
@@ -43,6 +41,8 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.android.car.apps.common.CircleBitmapDrawable;
+import com.android.car.apps.common.FabDrawable;
 import com.android.car.dialer.bluetooth.UiBluetoothMonitor;
 import com.android.car.dialer.telecom.TelecomUtils;
 import com.android.car.dialer.telecom.UiCall;
diff --git a/src/com/android/car/dialer/StrequentsAdapter.java b/src/com/android/car/dialer/StrequentsAdapter.java
index 763b5a0d..f2719a73 100644
--- a/src/com/android/car/dialer/StrequentsAdapter.java
+++ b/src/com/android/car/dialer/StrequentsAdapter.java
@@ -21,7 +21,6 @@ import android.database.Cursor;
 import android.graphics.PorterDuff;
 import android.provider.CallLog;
 import android.support.annotation.Nullable;
-import android.support.car.ui.PagedListView;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
@@ -32,6 +31,7 @@ import android.view.ViewGroup;
 import com.android.car.dialer.telecom.PhoneLoader;
 import com.android.car.dialer.telecom.TelecomUtils;
 import com.android.car.dialer.telecom.UiCallManager;
+import com.android.car.view.PagedListView;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/car/dialer/StrequentsFragment.java b/src/com/android/car/dialer/StrequentsFragment.java
index 3e744953..4e5e5ac1 100644
--- a/src/com/android/car/dialer/StrequentsFragment.java
+++ b/src/com/android/car/dialer/StrequentsFragment.java
@@ -27,7 +27,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.Nullable;
-import android.support.car.ui.PagedListView;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.RecyclerView;
@@ -38,6 +37,7 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import com.android.car.dialer.telecom.PhoneLoader;
 import com.android.car.dialer.telecom.UiCallManager;
+import com.android.car.view.PagedListView;
 
 /**
  * Contains a list of contacts. The call types can be any of the CALL_TYPE_* fields from
diff --git a/src/com/android/car/dialer/telecom/TelecomUtils.java b/src/com/android/car/dialer/telecom/TelecomUtils.java
index 6ccb4b2e..ffae7654 100644
--- a/src/com/android/car/dialer/telecom/TelecomUtils.java
+++ b/src/com/android/car/dialer/telecom/TelecomUtils.java
@@ -31,7 +31,6 @@ import android.provider.ContactsContract.PhoneLookup;
 import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
-import android.support.car.ui.CircleBitmapDrawable;
 import android.telecom.Call;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.TelephonyManager;
@@ -39,6 +38,7 @@ import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.Log;
 import android.widget.ImageView;
+import com.android.car.apps.common.CircleBitmapDrawable;
 import com.android.car.apps.common.LetterTileDrawable;
 import com.android.car.dialer.R;