Merge pull request #1242 from lioncash/sync

Android: Use apply() instead of commit() for SharedPreference changes.
This commit is contained in:
Lioncash 2014-10-10 18:42:54 -04:00
commit 98d9a38fe0
4 changed files with 5 additions and 5 deletions

View File

@ -190,13 +190,13 @@ public final class EmulationActivity extends Activity
{ {
overlay.setVisibility(View.VISIBLE); overlay.setVisibility(View.VISIBLE);
item.setTitle(R.string.disable_input_overlay); item.setTitle(R.string.disable_input_overlay);
sharedPrefs.edit().putBoolean("showInputOverlay", true).commit(); sharedPrefs.edit().putBoolean("showInputOverlay", true).apply();
} }
else // Hide the overlay else // Hide the overlay
{ {
overlay.setVisibility(View.INVISIBLE); overlay.setVisibility(View.INVISIBLE);
item.setTitle(R.string.enable_input_overlay); item.setTitle(R.string.enable_input_overlay);
sharedPrefs.edit().putBoolean("showInputOverlay", false).commit(); sharedPrefs.edit().putBoolean("showInputOverlay", false).apply();
} }
return true; return true;

View File

@ -96,7 +96,7 @@ public final class UserPreferences
editor.putBoolean("fastDepthCalculation", getConfig("gfx_opengl.ini", "Settings", "FastDepthCalc", "True").equals("True")); editor.putBoolean("fastDepthCalculation", getConfig("gfx_opengl.ini", "Settings", "FastDepthCalc", "True").equals("True"));
// Apply the changes. // Apply the changes.
editor.commit(); editor.apply();
} }
// Small utility method that shortens calls to NativeLibrary.GetConfig. // Small utility method that shortens calls to NativeLibrary.GetConfig.

View File

@ -156,7 +156,7 @@ public final class OverlayConfigButton extends Button implements OnTouchListener
SharedPreferences.Editor editor = sharedPrefs.edit(); SharedPreferences.Editor editor = sharedPrefs.edit();
editor.putFloat(buttonId+"-X", getX()); editor.putFloat(buttonId+"-X", getX());
editor.putFloat(buttonId+"-Y", getY()); editor.putFloat(buttonId+"-Y", getY());
editor.commit(); editor.apply();
return true; return true;
} }
} }

View File

@ -159,7 +159,7 @@ public final class VideoSettingsFragment extends PreferenceFragment
// Get an editor. // Get an editor.
SharedPreferences.Editor editor = sPrefs.edit(); SharedPreferences.Editor editor = sPrefs.edit();
editor.putString("gpuPref", "Software Renderer"); editor.putString("gpuPref", "Software Renderer");
editor.commit(); editor.apply();
videoBackends.setValue("Software Renderer"); videoBackends.setValue("Software Renderer");
videoBackends.setSummary("Software Renderer"); videoBackends.setSummary("Software Renderer");
} }