[Android] Remove constraint layout workaround after dependency update
Nicolas Pomepuy
git at videolan.org
Thu Mar 3 12:56:19 UTC 2022
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Wed Feb 16 13:30:12 2022 +0100| [66e373bd0c75f2a9d30317f76c7cf0f79d97c32f] | committer: Nicolas Pomepuy
Remove constraint layout workaround after dependency update
> https://code.videolan.org/videolan/vlc-android/commit/66e373bd0c75f2a9d30317f76c7cf0f79d97c32f
---
application/television/src/main/res/layout/tv_playlist_item.xml | 1 -
application/vlc-android/res/layout/audio_browser_item.xml | 1 -
application/vlc-android/res/layout/history_item.xml | 2 --
application/vlc-android/res/layout/playlist_item.xml | 3 +--
build.gradle | 1 -
5 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/application/television/src/main/res/layout/tv_playlist_item.xml b/application/television/src/main/res/layout/tv_playlist_item.xml
index f9726bd2d..a312fdcc6 100644
--- a/application/television/src/main/res/layout/tv_playlist_item.xml
+++ b/application/television/src/main/res/layout/tv_playlist_item.xml
@@ -19,7 +19,6 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:layout_optimizationLevel="cache_measures"
android:paddingEnd="@dimen/tv_overscan_horizontal"
android:minHeight="?android:attr/listPreferredItemHeight"
android:focusable="true"
diff --git a/application/vlc-android/res/layout/audio_browser_item.xml b/application/vlc-android/res/layout/audio_browser_item.xml
index 130798803..ba68367bf 100644
--- a/application/vlc-android/res/layout/audio_browser_item.xml
+++ b/application/vlc-android/res/layout/audio_browser_item.xml
@@ -52,7 +52,6 @@
android:focusable="true"
android:background="?attr/video_list_background"
selected="@{selected}"
- vlc:layout_optimizationLevel="cache_measures"
android:longClickable="true"
android:foreground="?attr/selectableItemBackground"
android:minHeight="@dimen/audio_browser_item_size"
diff --git a/application/vlc-android/res/layout/history_item.xml b/application/vlc-android/res/layout/history_item.xml
index efea7a496..4cfee2c04 100644
--- a/application/vlc-android/res/layout/history_item.xml
+++ b/application/vlc-android/res/layout/history_item.xml
@@ -39,7 +39,6 @@
android:clickable="true"
android:focusable="true"
android:minHeight="@dimen/audio_browser_item_size"
- app:layout_optimizationLevel="cache_measures"
android:onClick="@{holder::onClick}"
android:onLongClick="@{holder::onLongClick}">
@@ -52,7 +51,6 @@
android:layout_marginBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="16:10"
- app:layout_optimizationLevel="cache_measures"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
diff --git a/application/vlc-android/res/layout/playlist_item.xml b/application/vlc-android/res/layout/playlist_item.xml
index 9125d0662..02ecc91ac 100644
--- a/application/vlc-android/res/layout/playlist_item.xml
+++ b/application/vlc-android/res/layout/playlist_item.xml
@@ -40,8 +40,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/item_container"
- app:layout_optimizationLevel="cache_measures">
+ android:id="@+id/item_container">
<View
android:id="@+id/selector"
diff --git a/build.gradle b/build.gradle
index 885b2daa9..1b26357ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,6 @@ ext {
//fixme : When we update this dep, please verify of this issue is fixed: https://github.com/material-components/material-components-android/issues/1086
// if so, revert application/vlc-android/res/values[-v21]/styles.xml -> AppModalStyle
androidxMaterialVersion = '1.5.0'
- //fixme: when updating to 2.1.x+, we should remove the 'layout_optimizationLevel' attribute we added in some layouts as a workaround for this issue: https://issuetracker.google.com/issues/170313444
constraintLayoutVersion = '2.1.3'
viewPager2Version = "1.0.0"
archVersion = '2.1.0'
More information about the Android
mailing list