More changes to UI.

src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/QuickSettings.kt

@@ -687,8 +687,9 @@ class QuickSettings(val emulationFragment: EmulationFragment) {
 
         val multiplierRow = itemView.findViewById<LinearLayout>(R.id.frame_gen_multipliers)
         val targetRow = itemView.findViewById<LinearLayout>(R.id.frame_gen_targets)
-        val motionView = itemView.findViewById<ViewGroup>(R.id.frame_gen_motion)
-        val motionSwitch = itemView.findViewById<MaterialSwitch>(R.id.frame_gen_motion_switch)
+        val targetSection = itemView.findViewById<ViewGroup>(R.id.frame_gen_target_section)
+        val flowRow = itemView.findViewById<LinearLayout>(R.id.frame_gen_flow)
+        val flowSection = itemView.findViewById<ViewGroup>(R.id.frame_gen_flow_section)
 
         val multiplierNames =
             emulationFragment.resources.getStringArray(R.array.frameGenMultiplierNames)
@@ -696,10 +697,17 @@ class QuickSettings(val emulationFragment: EmulationFragment) {
             emulationFragment.resources.getIntArray(R.array.frameGenMultiplierValues)
         val targetValues =
             emulationFragment.resources.getIntArray(R.array.frameGenTargetRateValues)
+        val flowValues =
+            emulationFragment.resources.getIntArray(R.array.frameGenFlowScaleValues)
 
-        val columns = maxOf(multiplierValues.size + 1, targetValues.size).toFloat()
+        val columns = maxOf(
+            multiplierValues.size + 1,
+            targetValues.size,
+            flowValues.size + 1
+        ).toFloat()
         multiplierRow.weightSum = columns
         targetRow.weightSum = columns
+        flowRow.weightSum = columns
 
         val powerCell = addFrameGenCell(inflater, multiplierRow)
 
@@ -721,6 +729,16 @@ class QuickSettings(val emulationFragment: EmulationFragment) {
             targetCells.add(cell)
         }
 
+        val autoCell = addFrameGenCell(inflater, flowRow)
+        autoCell.setText(R.string.frame_gen_flow_auto)
+
+        val flowCells = mutableListOf<TextView>()
+        for (value in flowValues) {
+            val cell = addFrameGenCell(inflater, flowRow)
+            cell.text = "$value%"
+            flowCells.add(cell)
+        }
+
         val inactiveAlpha = 0.38f
 
         fun refresh() {
@@ -728,6 +746,9 @@ class QuickSettings(val emulationFragment: EmulationFragment) {
             val multiplier = IntSetting.RENDERER_FRAME_GEN_MULTIPLIER.getInt(needsGlobal = false)
             val target = IntSetting.RENDERER_FRAME_GEN_TARGET_RATE.getInt(needsGlobal = false)
             val fixed = target == 0
+            val flowAuto =
+                BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO.getBoolean(needsGlobal = false)
+            val flowScale = IntSetting.RENDERER_FRAME_GEN_FLOW_SCALE.getInt(needsGlobal = false)
 
             var powerLabel = R.string.frame_gen_off
             var rowAlpha = inactiveAlpha
@@ -750,15 +771,20 @@ class QuickSettings(val emulationFragment: EmulationFragment) {
                 cell.alpha = multiplierAlpha
             }
 
+            targetSection.alpha = rowAlpha
             targetCells.forEachIndexed { index, cell ->
                 cell.isEnabled = enabled
                 cell.isSelected = enabled && targetValues[index] == target
-                cell.alpha = rowAlpha
             }
 
-            motionView.isEnabled = enabled
-            motionSwitch.isEnabled = enabled
-            motionView.alpha = rowAlpha
+            flowSection.alpha = rowAlpha
+            autoCell.isEnabled = enabled
+            autoCell.isSelected = enabled && flowAuto
+
+            flowCells.forEachIndexed { index, cell ->
+                cell.isEnabled = enabled
+                cell.isSelected = enabled && !flowAuto && flowValues[index] == flowScale
+            }
         }
 
         powerCell.setOnClickListener {
@@ -790,15 +816,19 @@ class QuickSettings(val emulationFragment: EmulationFragment) {
             }
         }
 
-        motionSwitch.isChecked =
-            BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO.getBoolean(needsGlobal = false)
-        motionSwitch.setOnCheckedChangeListener { _, checked ->
-            BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO.setBoolean(checked)
+        autoCell.setOnClickListener {
+            BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO.setBoolean(true)
             saveSettings()
+            refresh()
         }
 
-        motionView.setOnClickListener {
-            motionSwitch.toggle()
+        flowCells.forEachIndexed { index, cell ->
+            cell.setOnClickListener {
+                IntSetting.RENDERER_FRAME_GEN_FLOW_SCALE.setInt(flowValues[index])
+                BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO.setBoolean(false)
+                saveSettings()
+                refresh()
+            }
         }
 
         refresh()

src/android/app/src/main/res/layout/item_quick_settings_frame_gen.xml

@@ -2,62 +2,109 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="16dp"
-    android:layout_marginEnd="16dp"
-    android:layout_marginTop="6dp"
-    android:layout_marginBottom="6dp"
-    android:background="@drawable/shader_card_background"
-    android:orientation="vertical"
-    android:paddingStart="16dp"
-    android:paddingEnd="10dp"
-    android:paddingTop="12dp"
-    android:paddingBottom="4dp">
-
-    <com.google.android.material.textview.MaterialTextView
-        style="@style/TextAppearance.Material3.TitleSmall"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/frame_gen" />
+    android:orientation="vertical">
 
     <LinearLayout
-        android:id="@+id/frame_gen_multipliers"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:orientation="horizontal" />
-
-    <LinearLayout
-        android:id="@+id/frame_gen_targets"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:orientation="horizontal" />
-
-    <LinearLayout
-        android:id="@+id/frame_gen_motion"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:background="?attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:orientation="horizontal">
+        android:orientation="vertical"
+        android:paddingStart="24dp"
+        android:paddingEnd="18dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="8dp">
 
         <com.google.android.material.textview.MaterialTextView
-            style="@style/TextAppearance.Material3.BodyMedium"
-            android:layout_width="0dp"
+            style="@style/TextAppearance.Material3.TitleSmall"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:text="@string/frame_gen_flow_scale_auto" />
+            android:layout_marginEnd="6dp"
+            android:text="@string/frame_gen" />
 
-        <com.google.android.material.materialswitch.MaterialSwitch
-            android:id="@+id/frame_gen_motion_switch"
-            android:layout_width="wrap_content"
+        <com.google.android.material.textview.MaterialTextView
+            style="@style/TextAppearance.Material3.BodySmall"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="12dp"
-            android:minHeight="48dp" />
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="6dp"
+            android:text="@string/frame_gen_quick_description"
+            android:textColor="?attr/colorOnSurfaceVariant" />
+
+        <LinearLayout
+            android:id="@+id/frame_gen_multipliers"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/frame_gen_target_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="24dp"
+        android:paddingEnd="18dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="8dp">
+
+        <com.google.android.material.textview.MaterialTextView
+            style="@style/TextAppearance.Material3.TitleSmall"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="6dp"
+            android:text="@string/frame_gen_target_rate" />
+
+        <com.google.android.material.textview.MaterialTextView
+            style="@style/TextAppearance.Material3.BodySmall"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="6dp"
+            android:text="@string/frame_gen_target_rate_quick_description"
+            android:textColor="?attr/colorOnSurfaceVariant" />
+
+        <LinearLayout
+            android:id="@+id/frame_gen_targets"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/frame_gen_flow_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="24dp"
+        android:paddingEnd="18dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="8dp">
+
+        <com.google.android.material.textview.MaterialTextView
+            style="@style/TextAppearance.Material3.TitleSmall"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="6dp"
+            android:text="@string/frame_gen_flow_scale" />
+
+        <com.google.android.material.textview.MaterialTextView
+            style="@style/TextAppearance.Material3.BodySmall"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="6dp"
+            android:text="@string/frame_gen_flow_scale_quick_description"
+            android:textColor="?attr/colorOnSurfaceVariant" />
+
+        <LinearLayout
+            android:id="@+id/frame_gen_flow"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal" />
 
     </LinearLayout>
 

src/android/app/src/main/res/values/arrays.xml

@@ -183,6 +183,12 @@
         <item>120</item>
     </integer-array>
 
+    <integer-array name="frameGenFlowScaleValues">
+        <item>50</item>
+        <item>75</item>
+        <item>100</item>
+    </integer-array>
+
     <string-array name="frameGenQueueTargetNames">
         <item>@string/frame_gen_queue_target_0</item>
         <item>@string/frame_gen_queue_target_1</item>

src/android/app/src/main/res/values/strings.xml

@@ -334,6 +334,10 @@
     <string name="frame_gen_on">On</string>
     <string name="frame_gen_off">Off</string>
     <string name="frame_gen_fixed">Fixed</string>
+    <string name="frame_gen_flow_auto">Auto</string>
+    <string name="frame_gen_quick_description">Turn frame generation on or off and choose the frame multiplier.</string>
+    <string name="frame_gen_target_rate_quick_description">Generate frames up to a target frame rate. The multiplier adjusts on its own.</string>
+    <string name="frame_gen_flow_scale_quick_description">Resolution used to estimate motion between frames. Lower values save GPU time.</string>
     <string name="frame_gen_queue_target">Frame queue target</string>
     <string name="frame_gen_queue_target_description">How many finished frames may wait ahead of the display. Larger queues absorb GPU spikes at the cost of input latency.</string>
     <string name="frame_gen_queue_target_0">Lowest latency (Unbuffered)</string>