diff --git a/demos/transformer/src/main/res/layout/bitmap_overlay_options.xml b/demos/transformer/src/main/res/layout/bitmap_overlay_options.xml
index e4320a679f..3ebd561f6a 100644
--- a/demos/transformer/src/main/res/layout/bitmap_overlay_options.xml
+++ b/demos/transformer/src/main/res/layout/bitmap_overlay_options.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2022 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+<!-- Copyright 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
@@ -27,8 +26,8 @@
     android:stretchColumns="1"
     android:layout_marginTop="32dp"
     android:measureWithLargestChild="true"
-    android:paddingLeft="24dp"
-    android:paddingRight="12dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="12dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
@@ -53,7 +52,7 @@
         android:valueFrom="0"
         android:value="1"
         android:valueTo="1"
-        android:layout_gravity="right|center_vertical"/>
+        android:layout_gravity="end|center_vertical"/>
     </TableRow>
   </TableLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/demos/transformer/src/main/res/layout/configuration_activity.xml b/demos/transformer/src/main/res/layout/configuration_activity.xml
index 08a2f6ed86..d492da4bbb 100644
--- a/demos/transformer/src/main/res/layout/configuration_activity.xml
+++ b/demos/transformer/src/main/res/layout/configuration_activity.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+<!-- Copyright 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
@@ -130,8 +129,8 @@
           android:text="@string/audio_mime"/>
         <Spinner
           android:id="@+id/audio_mime_spinner"
-          android:layout_gravity="right|center_vertical"
-          android:gravity="right" />
+          android:layout_gravity="end|center_vertical"
+          android:gravity="end" />
       </TableRow>
       <TableRow
         android:layout_weight="1"
@@ -141,8 +140,8 @@
           android:text="@string/video_mime"/>
         <Spinner
           android:id="@+id/video_mime_spinner"
-          android:layout_gravity="right|center_vertical"
-          android:gravity="right" />
+          android:layout_gravity="end|center_vertical"
+          android:gravity="end" />
       </TableRow>
       <TableRow
         android:layout_weight="1"
@@ -152,8 +151,8 @@
           android:text="@string/resolution_height"/>
         <Spinner
           android:id="@+id/resolution_height_spinner"
-          android:layout_gravity="right|center_vertical"
-          android:gravity="right" />
+          android:layout_gravity="end|center_vertical"
+          android:gravity="end" />
       </TableRow>
       <TableRow
         android:layout_weight="1"
@@ -163,8 +162,8 @@
           android:text="@string/scale"/>
         <Spinner
           android:id="@+id/scale_spinner"
-          android:layout_gravity="right|center_vertical"
-          android:gravity="right" />
+          android:layout_gravity="end|center_vertical"
+          android:gravity="end" />
       </TableRow>
       <TableRow
         android:layout_weight="1"
@@ -174,8 +173,8 @@
           android:text="@string/rotate"/>
         <Spinner
           android:id="@+id/rotate_spinner"
-          android:layout_gravity="right|center_vertical"
-          android:gravity="right" />
+          android:layout_gravity="end|center_vertical"
+          android:gravity="end" />
       </TableRow>
       <TableRow
         android:layout_weight="1">
@@ -224,8 +223,8 @@
           android:text="@string/hdr_mode"/>
         <Spinner
           android:id="@+id/hdr_mode_spinner"
-          android:layout_gravity="right|center_vertical"
-          android:gravity="right" />
+          android:layout_gravity="end|center_vertical"
+          android:gravity="end" />
       </TableRow>
     </TableLayout>
   </androidx.core.widget.NestedScrollView>
diff --git a/demos/transformer/src/main/res/layout/contrast_options.xml b/demos/transformer/src/main/res/layout/contrast_options.xml
index 4ccfdc0db5..6e1ad42aa7 100644
--- a/demos/transformer/src/main/res/layout/contrast_options.xml
+++ b/demos/transformer/src/main/res/layout/contrast_options.xml
@@ -1,49 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2022 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
+<!-- Copyright 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<androidx.appcompat.widget.LinearLayoutCompat
+  xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
+  android:layout_height="wrap_content"
+  android:orientation="horizontal"
   tools:context=".ConfigurationActivity">
 
-  <TableLayout
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:stretchColumns="1"
-      android:layout_marginTop="32dp"
-      android:measureWithLargestChild="true"
-      android:paddingLeft="24dp"
-      android:paddingRight="12dp"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      app:layout_constraintBottom_toBottomOf="parent">
-    <TableRow
-        android:layout_weight="1"
-        android:gravity="center_vertical" >
-        <TextView
-          android:text="@string/contrast_value" />
-        <com.google.android.material.slider.Slider
-          android:id="@+id/contrast_slider"
-          android:valueFrom="-1.0"
-          android:value="0.0"
-          android:valueTo="1.0"
-          android:layout_gravity="right"/>
-      </TableRow>
-  </TableLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+  <TextView
+    android:text="@string/contrast_value"
+    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    android:layout_gravity="center"
+    android:layout_marginStart="8dp"
+    android:layout_marginTop="24dp"
+    android:layout_marginBottom="8dp" />
+  <com.google.android.material.slider.Slider
+    android:id="@+id/contrast_slider"
+    android:valueFrom="-1.0"
+    android:value="0.0"
+    android:valueTo="1.0"
+    android:layout_height="wrap_content"
+    android:layout_width="0dp"
+    android:layout_marginStart="8dp"
+    android:layout_weight="1"
+    android:layout_marginTop="24dp"
+    android:layout_marginBottom="8dp"
+    android:layout_gravity="center"/>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/demos/transformer/src/main/res/layout/hsl_adjustment_options.xml b/demos/transformer/src/main/res/layout/hsl_adjustment_options.xml
index 7b847ad871..ff67b606c6 100644
--- a/demos/transformer/src/main/res/layout/hsl_adjustment_options.xml
+++ b/demos/transformer/src/main/res/layout/hsl_adjustment_options.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2022 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+<!-- Copyright 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 xmlns:app="http://schemas.android.com/apk/res-auto"
 xmlns:tools="http://schemas.android.com/tools"
@@ -27,8 +26,8 @@ tools:context=".ConfigurationActivity">
   android:stretchColumns="1"
   android:layout_marginTop="32dp"
   android:measureWithLargestChild="true"
-  android:paddingLeft="24dp"
-  android:paddingRight="12dp"
+  android:paddingStart="24dp"
+  android:paddingEnd="12dp"
   app:layout_constraintEnd_toEndOf="parent"
   app:layout_constraintStart_toStartOf="parent"
   app:layout_constraintTop_toTopOf="parent"
@@ -43,7 +42,7 @@ tools:context=".ConfigurationActivity">
       android:valueFrom="-360"
       android:value="0"
       android:valueTo="360"
-      android:layout_gravity="right"/>
+      android:layout_gravity="end"/>
   </TableRow>
   <TableRow
     android:layout_weight="1"
@@ -55,7 +54,7 @@ tools:context=".ConfigurationActivity">
       android:valueFrom="-100"
       android:value="0"
       android:valueTo="100"
-      android:layout_gravity="right"/>
+      android:layout_gravity="end"/>
   </TableRow>
   <TableRow
     android:layout_weight="1"
@@ -67,7 +66,7 @@ tools:context=".ConfigurationActivity">
       android:valueFrom="-100"
       android:value="0"
       android:valueTo="100"
-      android:layout_gravity="right"/>
+      android:layout_gravity="end"/>
   </TableRow>
 </TableLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/demos/transformer/src/main/res/layout/periodic_vignette_options.xml b/demos/transformer/src/main/res/layout/periodic_vignette_options.xml
index 06f196041b..8b6866ca01 100644
--- a/demos/transformer/src/main/res/layout/periodic_vignette_options.xml
+++ b/demos/transformer/src/main/res/layout/periodic_vignette_options.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2022 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+<!-- Copyright 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
@@ -27,8 +26,8 @@
       android:stretchColumns="1"
       android:layout_marginTop="32dp"
       android:measureWithLargestChild="true"
-      android:paddingLeft="24dp"
-      android:paddingRight="12dp"
+      android:paddingStart="24dp"
+      android:paddingEnd="12dp"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
@@ -43,7 +42,7 @@
           android:valueFrom="0.0"
           android:value="0.5"
           android:valueTo="1.0"
-          android:layout_gravity="right"/>
+          android:layout_gravity="end"/>
       </TableRow>
       <TableRow
         android:layout_weight="1"
@@ -55,7 +54,7 @@
           android:valueFrom="0.0"
           android:value="0.5"
           android:valueTo="1.0"
-          android:layout_gravity="right"/>
+          android:layout_gravity="end"/>
       </TableRow>
       <TableRow
         android:layout_weight="1"
@@ -66,7 +65,7 @@
           android:id="@+id/periodic_vignette_radius_range_slider"
           android:valueFrom="0.0"
           android:valueTo="1.414"
-          android:layout_gravity="right"/>
+          android:layout_gravity="end"/>
       </TableRow>
     </TableLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/demos/transformer/src/main/res/layout/preset_item.xml b/demos/transformer/src/main/res/layout/preset_item.xml
index ece15cc343..3c55d8f0a3 100644
--- a/demos/transformer/src/main/res/layout/preset_item.xml
+++ b/demos/transformer/src/main/res/layout/preset_item.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2023 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <androidx.appcompat.widget.LinearLayoutCompat
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
diff --git a/demos/transformer/src/main/res/layout/rgb_adjustment_options.xml b/demos/transformer/src/main/res/layout/rgb_adjustment_options.xml
index c87e8fad17..8140c460ca 100644
--- a/demos/transformer/src/main/res/layout/rgb_adjustment_options.xml
+++ b/demos/transformer/src/main/res/layout/rgb_adjustment_options.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2022 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+<!-- Copyright 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
@@ -27,8 +26,8 @@
     android:stretchColumns="1"
     android:layout_marginTop="32dp"
     android:measureWithLargestChild="true"
-    android:paddingLeft="24dp"
-    android:paddingRight="12dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="12dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
@@ -43,7 +42,7 @@
         android:valueFrom="0"
         android:value="1"
         android:valueTo="2"
-        android:layout_gravity="right"
+        android:layout_gravity="end"
         app:labelBehavior="gone"/>
     </TableRow>
     <TableRow
@@ -56,7 +55,7 @@
         android:valueFrom="0"
         android:value="1"
         android:valueTo="2"
-        android:layout_gravity="right"
+        android:layout_gravity="end"
         app:labelBehavior="gone"/>
     </TableRow>
     <TableRow
@@ -69,7 +68,7 @@
         android:valueFrom="0"
         android:value="1"
         android:valueTo="2"
-        android:layout_gravity="right"
+        android:layout_gravity="end"
         app:labelBehavior="gone"/>
     </TableRow>
   </TableLayout>
diff --git a/demos/transformer/src/main/res/layout/spinner_item.xml b/demos/transformer/src/main/res/layout/spinner_item.xml
index 6c7dfaa6f7..face712314 100644
--- a/demos/transformer/src/main/res/layout/spinner_item.xml
+++ b/demos/transformer/src/main/res/layout/spinner_item.xml
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+<!-- Copyright 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <TextView
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="wrap_content"
   android:layout_height="32dp"
-  android:gravity="left|center_vertical"
+  android:gravity="start|center_vertical"
   android:paddingLeft="4dp"
   android:paddingRight="4dp"
   android:layout_marginLeft="4dp"
diff --git a/demos/transformer/src/main/res/layout/text_overlay_options.xml b/demos/transformer/src/main/res/layout/text_overlay_options.xml
index 875afc6ed0..5680a217f8 100644
--- a/demos/transformer/src/main/res/layout/text_overlay_options.xml
+++ b/demos/transformer/src/main/res/layout/text_overlay_options.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2022 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+<!-- Copyright 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
@@ -27,8 +26,8 @@
     android:stretchColumns="1"
     android:layout_marginTop="32dp"
     android:measureWithLargestChild="true"
-    android:paddingLeft="24dp"
-    android:paddingRight="12dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="12dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
@@ -51,8 +50,8 @@
         android:text="@string/overlay_text_color"/>
       <Spinner
         android:id="@+id/text_overlay_text_color"
-        android:layout_gravity="right|center_vertical"
-        android:gravity="right" />
+        android:layout_gravity="end|center_vertical"
+        android:gravity="end" />
     </TableRow>
     <TableRow
       android:layout_weight="1"
@@ -63,7 +62,7 @@
         android:valueFrom="0"
         android:value="1"
         android:valueTo="1"
-        android:layout_gravity="right|center_vertical"/>
+        android:layout_gravity="end|center_vertical"/>
     </TableRow>
   </TableLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/demos/transformer/src/main/res/layout/transformer_activity.xml b/demos/transformer/src/main/res/layout/transformer_activity.xml
index d62e9cfe11..a821fcc64f 100644
--- a/demos/transformer/src/main/res/layout/transformer_activity.xml
+++ b/demos/transformer/src/main/res/layout/transformer_activity.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+<!-- Copyright 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
diff --git a/demos/transformer/src/main/res/layout/trim_options.xml b/demos/transformer/src/main/res/layout/trim_options.xml
index 5d020b0664..fa734ee37e 100644
--- a/demos/transformer/src/main/res/layout/trim_options.xml
+++ b/demos/transformer/src/main/res/layout/trim_options.xml
@@ -1,48 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2022 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
+<!-- Copyright 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<androidx.appcompat.widget.LinearLayoutCompat
+  xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
+  android:layout_height="wrap_content"
+  android:orientation="horizontal"
   tools:context=".ConfigurationActivity">
 
-  <TableLayout
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:stretchColumns="1"
-      android:layout_marginTop="32dp"
-      android:measureWithLargestChild="true"
-      android:paddingLeft="24dp"
-      android:paddingRight="12dp"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      app:layout_constraintBottom_toBottomOf="parent">
-      <TableRow
-        android:layout_weight="1"
-        android:gravity="center_vertical" >
-        <TextView
-          android:text="@string/trim_range" />
-        <com.google.android.material.slider.RangeSlider
-          android:id="@+id/trim_bounds_range_slider"
-          android:valueFrom="0.0"
-          android:valueTo="10.0"
-          android:layout_gravity="right"/>
-      </TableRow>
-    </TableLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="8dp"
+    android:layout_marginTop="24dp"
+    android:layout_marginBottom="8dp"
+    android:text="@string/trim_range"
+    android:layout_gravity="center"/>
+  <com.google.android.material.slider.RangeSlider
+    android:id="@+id/trim_bounds_range_slider"
+    android:layout_height="wrap_content"
+    android:layout_width="0dp"
+    android:layout_weight="1"
+    android:layout_marginStart="8dp"
+    android:layout_marginTop="24dp"
+    android:layout_marginBottom="8dp"
+    android:layout_gravity="center"
+    android:valueFrom="0.0"
+    android:valueTo="10.0"/>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/demos/transformer/src/main/res/values/arrays.xml b/demos/transformer/src/main/res/values/arrays.xml
index 854925a1dd..a9e52b84eb 100644
--- a/demos/transformer/src/main/res/values/arrays.xml
+++ b/demos/transformer/src/main/res/values/arrays.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2023 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+<!-- Copyright 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <resources>
    <string-array name="preset_descriptions">
       <item>720p H264 video and AAC audio</item>
diff --git a/demos/transformer/src/main/res/values/strings.xml b/demos/transformer/src/main/res/values/strings.xml
index 4ec8f9682f..7b32d75c6b 100644
--- a/demos/transformer/src/main/res/values/strings.xml
+++ b/demos/transformer/src/main/res/values/strings.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+<!-- Copyright 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="app_name" translatable="false">Transformer Demo</string>
   <string name="configuration" translatable="false">Configuration</string>