Merge remote-tracking branch 'origin/beta' into beta

Mahmud0808 · Sep 16, 2023 · 1639b73 · 1639b73
2 parents cc7c1c1 + 01ea8b2
commit 1639b73
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/src/main/res/layout/activity_volume_panel.xml b/app/src/main/res/layout/activity_volume_panel.xml
@@ -100,7 +100,7 @@
                         android:paddingEnd="0dp"
                         android:paddingBottom="11dp"
                         android:singleLine="true"
-                        android:text="Thin"
+                        android:text="@string/vp_track_thin"
                         android:textSize="14sp" />
 
                     <com.google.android.material.button.MaterialButton
@@ -117,7 +117,7 @@
                         android:paddingEnd="0dp"
                         android:paddingBottom="11dp"
                         android:singleLine="true"
-                        android:text="Thick"
+                        android:text="@string/vp_track_thick"
                         android:textSize="14sp" />
 
                     <com.google.android.material.button.MaterialButton
@@ -132,7 +132,7 @@
                         android:paddingEnd="0dp"
                         android:paddingBottom="11dp"
                         android:singleLine="true"
-                        android:text="None"
+                        android:text="@string/vp_track_none"
                         android:textSize="14sp" />
 
                 </com.google.android.material.button.MaterialButtonToggleGroup>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -240,7 +240,7 @@
     <string name="pitch_black_dark_desc">Enable pitch black dark theme</string>
     <string name="pitch_black_amoled_title">Pitch Black (Amoled)</string>
     <string name="pitch_black_amoled_desc">Enable pitch black amoled theme</string>
-    <string name="section_title_misc">Misc</string>
+    <string name="section_title_misc">Misc.</string>
     <string name="minimal_qspanel">Minimal QS Panel</string>
     <string name="remove_top_shade_of_qspanel">Remove top shade of QS panel</string>
     <string name="disable_monet_title">Disable System Monet</string>
@@ -362,6 +362,9 @@
 
     <!-- Volume Panel -->
     <string name="section_title_volume_slider_track">Volume Slider Track</string>
+    <string name="vp_track_thin">Thin</string>
+    <string name="vp_track_thick">Thick</string>
+    <string name="vp_track_none">None</string>
     <string name="vp_thin_background_title">Thin Background</string>
     <string name="vp_thin_background_desc">Make track of volume slider thin</string>
     <string name="vp_thick_background_title">Thick Background</string>