piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9112 from Ebola16/setmin

Browse Source 
Android: seekbar.setMin requires API level 26
This commit is contained in:
JosJuice 2020-09-27 17:36:05 +02:00 committed by GitHub
commit 960750003e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
View File

@ -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();
}