Merge pull request #9112 from Ebola16/setmin

Android: seekbar.setMin requires API level 26
dolphin-emu · Sep 27, 2020 · 9607500 · 9607500
2 parents 6cb14a9 + 42b2d11
commit 9607500
Showing 1 changed file with 25 additions and 3 deletions.
diff --git a/...oid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java b/...oid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
+import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -239,7 +240,10 @@ public void onSliderClick(SliderSetting item, int position)
 
     SeekBar seekbar = view.findViewById(R.id.seekbar);
 
-    seekbar.setMin(item.getMin());
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+    {
+      seekbar.setMin(item.getMin());
+    }
     seekbar.setMax(item.getMax());
     seekbar.setProgress(mSeekbarProgress);
     seekbar.setKeyProgressIncrement(5);
@@ -413,7 +417,16 @@ else if (mClickedItem instanceof IntSliderSetting)
       if (sliderSetting.getSelectedValue(getSettings()) != mSeekbarProgress)
         mView.onSettingChanged();
 
-      sliderSetting.setSelectedValue(getSettings(), mSeekbarProgress);
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+      {
+        sliderSetting.setSelectedValue(getSettings(), mSeekbarProgress);
+      }
+      else
+      {
+        sliderSetting
+                .setSelectedValue(getSettings(),
+                        Math.max(mSeekbarProgress, sliderSetting.getMin()));
+      }
 
       closeDialog();
     }
@@ -423,7 +436,16 @@ else if (mClickedItem instanceof FloatSliderSetting)
       if (sliderSetting.getSelectedValue(getSettings()) != mSeekbarProgress)
         mView.onSettingChanged();
 
-      sliderSetting.setSelectedValue(getSettings(), mSeekbarProgress);
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+      {
+        sliderSetting.setSelectedValue(getSettings(), mSeekbarProgress);
+      }
+      else
+      {
+        sliderSetting
+                .setSelectedValue(getSettings(),
+                        Math.max(mSeekbarProgress, sliderSetting.getMin()));
+      }
 
       closeDialog();
     }