Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: frontend: Fix settings slider cancel button.

Browse Source
This commit is contained in:
bunnei 2019-07-18 22:42:14 -04:00
parent 8f89bd53ff
commit 234e1f2ad2
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java
View File

@ -149,6 +149,13 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
mDialog = builder.show();
}
DialogInterface.OnClickListener defaultCancelListener = new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
closeDialog();
}
};
public void onDateTimeClick(DateTimeSetting item) {
mClickedItem = item;
@ -188,15 +195,10 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
closeDialog();
}
};
DialogInterface.OnClickListener cancel = new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
closeDialog();
}
};
builder.setView(view);
builder.setPositiveButton("Set", ok);
builder.setNegativeButton("Cancel", cancel);
builder.setPositiveButton(R.string.ok, ok);
builder.setNegativeButton(R.string.cancel, defaultCancelListener);
mDialog = builder.show();
}
@ -211,7 +213,7 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
builder.setTitle(item.getNameId());
builder.setView(view);
builder.setPositiveButton(R.string.ok, this);
builder.setNegativeButton(R.string.cancel, this);
builder.setNegativeButton(R.string.cancel, defaultCancelListener);
mDialog = builder.show();
mTextSliderValue = view.findViewById(R.id.text_value);