Remove label for experimental features in display settings

This reverts commit 77c36d5.
Igalia · Feb 15, 2024 · 1933551 · 1933551
1 parent d9c38c9
commit 1933551
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 60 deletions.
diff --git a/app/src/main/res/drawable/settings_group_borders.xml b/app/src/main/res/drawable/settings_group_borders.xml
diff --git a/app/src/main/res/layout/options_display.xml b/app/src/main/res/layout/options_display.xml
@@ -122,47 +122,33 @@
                     app:hintTextColor="@color/iron_blur"
                     app:highlightedTextColor="@color/fog" />
 
-                <LinearLayout android:orientation="vertical"
-                    android:layout_marginTop="5dp"
+                <com.igalia.wolvic.ui.views.settings.SliderSetting
+                    android:id="@+id/window_distance_slider"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/settings_group_borders">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:textColor="@color/photonRed40"
-                        android:text="@string/experimental_features"/>
-
-                    <com.igalia.wolvic.ui.views.settings.SliderSetting
-                        android:id="@+id/window_distance_slider"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:description="@string/display_options_windows_distance"
-                        app:stepSize="0.1"
-                        app:valueFrom="0.0"
-                        app:valueTo="1.0" />
-
-                    <com.igalia.wolvic.ui.views.settings.SwitchSetting
-                        android:id="@+id/center_windows_switch"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:description="@string/developer_options_center_windows" />
-
-                    <com.igalia.wolvic.ui.views.settings.SwitchSetting
-                        android:id="@+id/headLockSwitch"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:description="@string/display_options_head_lock" />
-
-                    <com.igalia.wolvic.ui.views.settings.SwitchSetting
-                        android:id="@+id/windowMovementSwitch"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:description="@string/display_options_windows_can_move" />
-
-                </LinearLayout>
+                    app:description="@string/display_options_windows_distance"
+                    app:stepSize="0.1"
+                    app:valueFrom="0.0"
+                    app:valueTo="1.0" />
+
+                <com.igalia.wolvic.ui.views.settings.SwitchSetting
+                    android:id="@+id/center_windows_switch"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:description="@string/developer_options_center_windows" />
+
+                <com.igalia.wolvic.ui.views.settings.SwitchSetting
+                    android:id="@+id/headLockSwitch"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:description="@string/display_options_head_lock" />
+
+                <com.igalia.wolvic.ui.views.settings.SwitchSetting
+                    android:id="@+id/windowMovementSwitch"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:description="@string/display_options_windows_can_move" />
+
             </LinearLayout>
         </com.igalia.wolvic.ui.views.CustomScrollView>
 

diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
@@ -535,9 +535,6 @@
          for the virtual displays Dots Per Inch (DPI). -->
     <string name="developer_options_display_dpi">Display DPI:</string>
 
-    <!-- This string is used to label the experimental features. -->
-    <string name="experimental_features">Experimental Features</string>
-
     <!-- This string is used to label radio buttons for setting Multi-Sample Anti-Aliasing (MSAA) in
          VR Immersive Mode. -->
     <string name="developer_options_msaa">MSAA</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -1330,9 +1330,6 @@
          and also from disk. -->
     <string name="download_context_delete">Eliminar</string>
 
-    <!-- This string is used to label the experimental features. -->
-    <string name="experimental_features">Funcionalidades experimentales</string>
-
     <!-- This string labels an On/Off switch in the 'Display Options' dialog
          and is used to customize if we use passthrough mode when the app starts. -->
     <string name="display_options_start_with_passthrough">Iniciar en modo Passthrough</string>

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -420,8 +420,6 @@
     <!-- This string is used to label a numerical entry field where the user may enter a new value
          for the virtual displays Dots Per Inch (DPI). -->
     <string name="developer_options_display_dpi">显示像素密度（DPI）：</string>
-    <!-- This string is used to label the experimental features. -->
-    <string name="experimental_features">试用功能</string>
     <!-- This string is used to label radio buttons for setting Multi-Sample Anti-Aliasing (MSAA) in
          VR Immersive Mode. -->
     <string name="developer_options_msaa">多重采样抗锯齿（MSAA）</string>

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -541,9 +541,6 @@
          for the virtual displays Dots Per Inch (DPI). -->
     <string name="developer_options_display_dpi">顯示密度（DPI）:</string>
 
-    <!-- This string is used to label the experimental features. -->
-    <string name="experimental_features">實驗性功能</string>
-
     <!-- This string is used to label radio buttons for setting Multi-Sample Anti-Aliasing (MSAA) in
          VR Immersive Mode. -->
     <string name="developer_options_msaa">多重採樣抗鋸齒（MSAA）</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -584,9 +584,6 @@
          for the virtual displays Dots Per Inch (DPI). -->
     <string name="developer_options_display_dpi">Display DPI:</string>
 
-    <!-- This string is used to label the experimental features. -->
-    <string name="experimental_features">Experimental Features</string>
-
     <!-- This string is used to label radio buttons for setting Multi-Sample Anti-Aliasing (MSAA) in
          VR Immersive Mode. -->
     <string name="developer_options_msaa">MSAA</string>