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: I7822850b54ec3cae73a88e0c9a77698bb5d793af
diff --git a/Android.mk b/Android.mk
index ab07ab1..4a0095d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,8 +32,6 @@
LOCAL_PRIVILEGED_MODULE := true
-include packages/apps/Car/libs/car-stream-ui-lib/car-stream-ui-lib.mk
-
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
LOCAL_STATIC_JAVA_LIBRARIES += android-support-design
LOCAL_STATIC_JAVA_LIBRARIES += car-stream-lib
@@ -53,6 +51,8 @@
LOCAL_DEX_PREOPT := false
+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 packages/services/Car/car-support-lib/car-support.mk
include $(BUILD_PACKAGE)
diff --git a/res/layout/radio_presets_list.xml b/res/layout/radio_presets_list.xml
index 67e16cc..ca6cddb 100644
--- a/res/layout/radio_presets_list.xml
+++ b/res/layout/radio_presets_list.xml
@@ -41,7 +41,7 @@
android:layout_height="match_parent" />
</FrameLayout>
- <android.support.car.ui.PagedListView
+ <com.android.car.view.PagedListView
android:id="@+id/presets_list"
android:background="@android:color/transparent"
android:layout_marginTop="@dimen/car_preset_container_height"
diff --git a/src/com/android/car/radio/PlayPauseButton.java b/src/com/android/car/radio/PlayPauseButton.java
index e3a7809..5a2f33c 100644
--- a/src/com/android/car/radio/PlayPauseButton.java
+++ b/src/com/android/car/radio/PlayPauseButton.java
@@ -18,10 +18,10 @@
import android.content.Context;
import android.media.session.PlaybackState;
-import android.support.car.ui.FabDrawable;
import android.util.AttributeSet;
import android.util.Log;
import android.widget.ImageView;
+import com.android.car.apps.common.FabDrawable;
/**
* An {@link ImageView} that renders a play/pause button like a floating action button.
diff --git a/src/com/android/car/radio/PresetListScrollListener.java b/src/com/android/car/radio/PresetListScrollListener.java
index 8bfcd5d..f938f36 100644
--- a/src/com/android/car/radio/PresetListScrollListener.java
+++ b/src/com/android/car/radio/PresetListScrollListener.java
@@ -18,9 +18,9 @@
import android.animation.ValueAnimator;
import android.content.Context;
-import android.support.car.ui.PagedListView;
import android.support.v7.widget.RecyclerView;
import android.view.View;
+import com.android.car.view.PagedListView;
/**
* Listener on the preset list that will add elevation on the container holding the current
diff --git a/src/com/android/car/radio/PresetsAdapter.java b/src/com/android/car/radio/PresetsAdapter.java
index 63d91eb..6b0a0ce 100644
--- a/src/com/android/car/radio/PresetsAdapter.java
+++ b/src/com/android/car/radio/PresetsAdapter.java
@@ -16,13 +16,13 @@
package com.android.car.radio;
-import android.support.car.ui.PagedListView;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.android.car.radio.service.RadioStation;
+import com.android.car.view.PagedListView;
import java.util.List;
diff --git a/src/com/android/car/radio/RadioFabButton.java b/src/com/android/car/radio/RadioFabButton.java
index b4fb7f5..2430de7 100644
--- a/src/com/android/car/radio/RadioFabButton.java
+++ b/src/com/android/car/radio/RadioFabButton.java
@@ -17,9 +17,9 @@
import android.content.Context;
import android.support.annotation.ColorInt;
-import android.support.car.ui.FabDrawable;
import android.util.AttributeSet;
import android.widget.ImageView;
+import com.android.car.apps.common.FabDrawable;
/**
* A default FAB button for the radio that will color itself based on the accent color defined
diff --git a/src/com/android/car/radio/RadioPresetsFragment.java b/src/com/android/car/radio/RadioPresetsFragment.java
index 139a53e..7db5c99 100644
--- a/src/com/android/car/radio/RadioPresetsFragment.java
+++ b/src/com/android/car/radio/RadioPresetsFragment.java
@@ -23,13 +23,13 @@
import android.content.res.Resources;
import android.graphics.Canvas;
import android.os.Bundle;
-import android.support.car.ui.PagedListView;
import android.support.v4.app.Fragment;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import com.android.car.view.PagedListView;
import com.android.car.radio.service.RadioStation;
import java.util.List;
