diff options
| author | Saeid Farivar Asanjan <farivar@google.com> | 2021-11-12 19:10:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-11-12 19:10:02 +0000 |
| commit | 167d8eb2635a299e26702dcf943abdc02a7c6aa3 (patch) | |
| tree | 8c913b6f2bba84e24af91e185e64514087b243f1 | |
| parent | fb72ad93b71c04484b7a0666a1f00aae159d90d2 (diff) | |
| parent | ba38c6e324a18155ad50a730da9dd2370ad7a795 (diff) | |
| download | Media-167d8eb2635a299e26702dcf943abdc02a7c6aa3.tar.gz | |
Merge "Replace addItemDecoration with layout_margin" into sc-v2-dev
| -rw-r--r-- | res/layout/media_browse_grid_item.xml | 1 | ||||
| -rw-r--r-- | res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | src/com/android/car/media/BrowseViewController.java | 4 | ||||
| -rw-r--r-- | src/com/android/car/media/PlaybackFragment.java | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/res/layout/media_browse_grid_item.xml b/res/layout/media_browse_grid_item.xml index ad5c1ac..002b076 100644 --- a/res/layout/media_browse_grid_item.xml +++ b/res/layout/media_browse_grid_item.xml @@ -19,6 +19,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_margin="@dimen/grid_item_spacing" android:padding="@dimen/media_browse_grid_item_padding" android:layout_marginBottom="@dimen/media_browse_grid_item_margin_bottom"> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 84d326e..ebc0b8c 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -97,7 +97,7 @@ <!-- BrowseFragment.java --> <!-- Spacer used between the app bar and the top of the browse list/grid --> <dimen name="browse_spacer_height">@dimen/car_ui_padding_2</dimen> - <dimen name="grid_item_spacing">@dimen/car_ui_padding_3</dimen> + <dimen name="grid_item_spacing">@dimen/car_ui_padding_1</dimen> <!-- Space between title and subtitle on media browse list/grid --> <dimen name="media_browse_subtitle_margin_top">@dimen/car_ui_padding_0</dimen> diff --git a/src/com/android/car/media/BrowseViewController.java b/src/com/android/car/media/BrowseViewController.java index d0c6f88..db1cca3 100644 --- a/src/com/android/car/media/BrowseViewController.java +++ b/src/com/android/car/media/BrowseViewController.java @@ -38,7 +38,6 @@ import com.android.car.apps.common.util.FutureData; import com.android.car.apps.common.util.ViewUtils; import com.android.car.media.browse.BrowseAdapter; import com.android.car.media.browse.LimitedBrowseAdapter; -import com.android.car.media.common.GridSpacingItemDecoration; import com.android.car.media.common.MediaItemMetadata; import com.android.car.media.common.browse.MediaBrowserViewModelImpl; import com.android.car.media.common.browse.MediaItemsRepository.MediaItemsLiveData; @@ -184,9 +183,6 @@ public class BrowseViewController { FragmentActivity activity = callbacks.getActivity(); mViewModel = ViewModelProviders.of(activity).get(MediaActivity.ViewModel.class); - mBrowseList.addItemDecoration(new GridSpacingItemDecoration( - activity.getResources().getDimensionPixelSize(R.dimen.grid_item_spacing))); - BrowseAdapter browseAdapter = new BrowseAdapter(mBrowseList.getContext()); mLimitedBrowseAdapter = new LimitedBrowseAdapter(mBrowseList, browseAdapter, mBrowseAdapterObserver); diff --git a/src/com/android/car/media/PlaybackFragment.java b/src/com/android/car/media/PlaybackFragment.java index 2d12807..fa3ab7a 100644 --- a/src/com/android/car/media/PlaybackFragment.java +++ b/src/com/android/car/media/PlaybackFragment.java @@ -623,6 +623,8 @@ public class PlaybackFragment extends Fragment { int decorationHeight = getResources().getDimensionPixelSize( R.dimen.playback_queue_list_padding_top); + // TODO (b/206038962): addItemDecoration is not supported anymore. Find another way to + // support this. // Put the decoration above the first item. int decorationPosition = 0; mQueue.addItemDecoration(new QueueTopItemDecoration(decorationHeight, decorationPosition)); |