diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-10-10 18:42:54 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-10-10 18:42:54 -0400 |
| commit | 98d9a38fe09b3f372e99a2a8204d1b0f733a56ce (patch) | |
| tree | 10b98aee1540693498d222391a221812bf0d4fc5 /Source/Android/src | |
| parent | f6233cd531f94b9d3cd106ca4ebf704a98f5dfca (diff) | |
| parent | 053f5c1f17abd95dd814b1a728dd53db1304e624 (diff) | |
Merge pull request #1242 from lioncash/sync
Android: Use apply() instead of commit() for SharedPreference changes.
Diffstat (limited to 'Source/Android/src')
4 files changed, 5 insertions, 5 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java index cd2dd461ff..cd01979afa 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java @@ -190,13 +190,13 @@ public final class EmulationActivity extends Activity { overlay.setVisibility(View.VISIBLE); item.setTitle(R.string.disable_input_overlay); - sharedPrefs.edit().putBoolean("showInputOverlay", true).commit(); + sharedPrefs.edit().putBoolean("showInputOverlay", true).apply(); } else // Hide the overlay { overlay.setVisibility(View.INVISIBLE); item.setTitle(R.string.enable_input_overlay); - sharedPrefs.edit().putBoolean("showInputOverlay", false).commit(); + sharedPrefs.edit().putBoolean("showInputOverlay", false).apply(); } return true; diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java index 9dbb2562f1..c45914db95 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java @@ -96,7 +96,7 @@ public final class UserPreferences editor.putBoolean("fastDepthCalculation", getConfig("gfx_opengl.ini", "Settings", "FastDepthCalc", "True").equals("True")); // Apply the changes. - editor.commit(); + editor.apply(); } // Small utility method that shortens calls to NativeLibrary.GetConfig. diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java index 5cd82d041d..0d4767eec4 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java @@ -156,7 +156,7 @@ public final class OverlayConfigButton extends Button implements OnTouchListener SharedPreferences.Editor editor = sharedPrefs.edit(); editor.putFloat(buttonId+"-X", getX()); editor.putFloat(buttonId+"-Y", getY()); - editor.commit(); + editor.apply(); return true; } } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java index ac5a0da65c..e5444e8c3b 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java @@ -159,7 +159,7 @@ public final class VideoSettingsFragment extends PreferenceFragment // Get an editor. SharedPreferences.Editor editor = sPrefs.edit(); editor.putString("gpuPref", "Software Renderer"); - editor.commit(); + editor.apply(); videoBackends.setValue("Software Renderer"); videoBackends.setSummary("Software Renderer"); } |