diff options
| author | Ryan Meredith <rwm@udel.edu> | 2020-09-26 23:55:16 -0400 |
|---|---|---|
| committer | Ryan Meredith <rwm@udel.edu> | 2020-09-26 23:55:16 -0400 |
| commit | 42b2d11f8d351eb79e67a7bd34ec79cce450c199 (patch) | |
| tree | 4c7e1b426d1c4003a8e90267cfd475792e68c003 /Source | |
| parent | 57f14b260bf043b6c261ca284b6c45fa3a7932de (diff) | |
Android: seekbar.setMin requires API level 26
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java index 605c23854e..7095b195a8 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java @@ -2,6 +2,7 @@ package org.dolphinemu.dolphinemu.features.settings.ui; 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 final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde 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 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde 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 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde 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(); } |