diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-12 00:39:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-12 00:39:22 +0000 |
commit | ec5e54e7799dc38a63ee433f885d144f311ad680 (patch) | |
tree | cdf1bdc453f50af79972ce33468deea53bf2d6c7 | |
parent | 38b84bf0b1ff9a71c7765a05f4199d81eb149182 (diff) | |
parent | d9b1c754687406dd83071f4c50d139bb9faf3947 (diff) | |
download | Media-ec5e54e7799dc38a63ee433f885d144f311ad680.tar.gz |
Snap for 7906314 from fb72ad93b71c04484b7a0666a1f00aae159d90d2 to sc-v2-release am: d9b1c75468
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Media/+/16240170
Change-Id: Id17aafa8d93d2cb2e7ac67b6bc4a81993c12edb0
-rw-r--r-- | build.gradle | 1 | ||||
-rw-r--r-- | src/com/android/car/media/BrowseViewController.java | 2 | ||||
-rw-r--r-- | src/com/android/car/media/MediaActivity.java | 4 | ||||
-rw-r--r-- | src/com/android/car/media/MediaActivityController.java | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle index 8663476..98b389f 100644 --- a/build.gradle +++ b/build.gradle @@ -71,7 +71,6 @@ dependencies { implementation project(":car-ui-lib") implementation project(":car-apps-common") - implementation project(":car-arch-common") implementation project(":car-media-common") implementation project(":car-uxr-client-lib") } diff --git a/src/com/android/car/media/BrowseViewController.java b/src/com/android/car/media/BrowseViewController.java index 337e5bc..d0c6f88 100644 --- a/src/com/android/car/media/BrowseViewController.java +++ b/src/com/android/car/media/BrowseViewController.java @@ -34,8 +34,8 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.RecyclerView; +import com.android.car.apps.common.util.FutureData; import com.android.car.apps.common.util.ViewUtils; -import com.android.car.arch.common.FutureData; import com.android.car.media.browse.BrowseAdapter; import com.android.car.media.browse.LimitedBrowseAdapter; import com.android.car.media.common.GridSpacingItemDecoration; diff --git a/src/com/android/car/media/MediaActivity.java b/src/com/android/car/media/MediaActivity.java index 8adc786..b437a1a 100644 --- a/src/com/android/car/media/MediaActivity.java +++ b/src/com/android/car/media/MediaActivity.java @@ -17,8 +17,8 @@ package com.android.car.media; import static android.car.media.CarMediaManager.MEDIA_SOURCE_MODE_BROWSE; +import static com.android.car.apps.common.util.LiveDataFunctions.dataOf; import static com.android.car.apps.common.util.VectorMath.EPSILON; -import static com.android.car.arch.common.LiveDataFunctions.dataOf; import android.annotation.SuppressLint; import android.app.AlertDialog; @@ -53,9 +53,9 @@ import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModelProviders; import com.android.car.apps.common.util.CarPackageManagerUtils; +import com.android.car.apps.common.util.FutureData; import com.android.car.apps.common.util.VectorMath; import com.android.car.apps.common.util.ViewUtils; -import com.android.car.arch.common.FutureData; import com.android.car.media.common.MediaItemMetadata; import com.android.car.media.common.MinimizedPlaybackControlBar; import com.android.car.media.common.PlaybackErrorsHelper; diff --git a/src/com/android/car/media/MediaActivityController.java b/src/com/android/car/media/MediaActivityController.java index 9811945..efe1d3d 100644 --- a/src/com/android/car/media/MediaActivityController.java +++ b/src/com/android/car/media/MediaActivityController.java @@ -37,9 +37,9 @@ import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.android.car.apps.common.util.FutureData; import com.android.car.apps.common.util.ViewUtils; import com.android.car.apps.common.util.ViewUtils.ViewAnimEndListener; -import com.android.car.arch.common.FutureData; import com.android.car.media.common.MediaItemMetadata; import com.android.car.media.common.browse.MediaBrowserViewModelImpl; import com.android.car.media.common.browse.MediaItemsRepository; |