From e045fd4c089bcabc4e560f4f81392d3bfcf332f4 Mon Sep 17 00:00:00 2001
From: Joshua Brown <keyboardr@google.com>
Date: Fri, 27 Apr 2018 13:10:55 -0700
Subject: Cleanup for packages/apps/Car/Media

Removes unused sharedUserId, and uses the correct R class

Bug: 78784683
Test: Manual
Change-Id: Ia7556ea7e0091aef00c2f6cf5d3c4047ab335bc2
---
 src/com/android/car/media/browse/BrowseItemViewType.java | 10 +++++-----
 src/com/android/car/media/browse/BrowseViewHolder.java   |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/com')

diff --git a/src/com/android/car/media/browse/BrowseItemViewType.java b/src/com/android/car/media/browse/BrowseItemViewType.java
index cfbdee7..0a9e66e 100644
--- a/src/com/android/car/media/browse/BrowseItemViewType.java
+++ b/src/com/android/car/media/browse/BrowseItemViewType.java
@@ -23,15 +23,15 @@ import android.support.annotation.LayoutRes;
  */
 public enum BrowseItemViewType {
     /** A section header */
-    HEADER(com.android.car.media.common.R.layout.media_browse_header_item),
+    HEADER(com.android.car.media.R.layout.media_browse_header_item),
     /** A grid item including an image and a title */
-    GRID_ITEM(com.android.car.media.common.R.layout.media_browse_grid_item, 1),
+    GRID_ITEM(com.android.car.media.R.layout.media_browse_grid_item, 1),
     /** A list item including title and subtitle */
-    LIST_ITEM(com.android.car.media.common.R.layout.media_browse_list_item),
+    LIST_ITEM(com.android.car.media.R.layout.media_browse_list_item),
     /** An item in a panel of items (menu) */
-    PANEL_ITEM(com.android.car.media.common.R.layout.media_browse_panel_item),
+    PANEL_ITEM(com.android.car.media.R.layout.media_browse_panel_item),
     /** A footer that can be used to navigate to an expanded version of a section */
-    MORE_FOOTER(com.android.car.media.common.R.layout.media_browse_more_footer),
+    MORE_FOOTER(com.android.car.media.R.layout.media_browse_more_footer),
     ;
     private final @LayoutRes int mLayoutId;
     private final int mSpanSize;
diff --git a/src/com/android/car/media/browse/BrowseViewHolder.java b/src/com/android/car/media/browse/BrowseViewHolder.java
index 28ec64c..e025e2c 100644
--- a/src/com/android/car/media/browse/BrowseViewHolder.java
+++ b/src/com/android/car/media/browse/BrowseViewHolder.java
@@ -39,10 +39,10 @@ class BrowseViewHolder extends RecyclerView.ViewHolder {
      */
     BrowseViewHolder(View itemView) {
         super(itemView);
-        mTitle = itemView.findViewById(com.android.car.media.common.R.id.title);
-        mSubtitle = itemView.findViewById(com.android.car.media.common.R.id.subtitle);
-        mAlbumArt = itemView.findViewById(com.android.car.media.common.R.id.thumbnail);
-        mContainer = itemView.findViewById(com.android.car.media.common.R.id.container);
+        mTitle = itemView.findViewById(com.android.car.media.R.id.title);
+        mSubtitle = itemView.findViewById(com.android.car.media.R.id.subtitle);
+        mAlbumArt = itemView.findViewById(com.android.car.media.R.id.thumbnail);
+        mContainer = itemView.findViewById(com.android.car.media.R.id.container);
     }
 
     /**
-- 
cgit v1.2.3