diff --git a/android/phoenix/res/xml/audio_preferences.xml b/android/phoenix/res/xml/audio_preferences.xml index de17deb92a..1a42da4399 100644 --- a/android/phoenix/res/xml/audio_preferences.xml +++ b/android/phoenix/res/xml/audio_preferences.xml @@ -18,10 +18,4 @@ android:summary="@string/audio_latency_desc" android:title="@string/audio_latency" android:dependency="audio_enable" /> - - \ No newline at end of file + diff --git a/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java b/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java index 23bc344759..eb9bf9b3bd 100644 --- a/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java +++ b/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java @@ -224,47 +224,6 @@ public final class MainMenuFragment extends PreferenceListFragment implements On SharedPreferences prefs = UserPreferences.getPreferences(ctx); SharedPreferences.Editor edit = prefs.edit(); edit.putString("video_refresh_rate", Double.toString(60.00d)); - edit.putBoolean("audio_latency_auto", true); - edit.commit(); - UserPreferences.updateConfigFile(ctx); - } - }); - alert.show(); - retval = true; - } - else if (Build.MODEL.equals("GAMEMID_BT")) - { - AlertDialog.Builder alert = new AlertDialog.Builder(ctx); - alert.setTitle(R.string.game_mid_detected); - alert.setMessage(messageId); - alert.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int which) - { - SharedPreferences prefs = UserPreferences.getPreferences(ctx); - SharedPreferences.Editor edit = prefs.edit(); - edit.putBoolean("audio_latency_auto", false); - edit.commit(); - UserPreferences.updateConfigFile(ctx); - } - }); - alert.show(); - retval = true; - } - else if (Build.MODEL.equals("OUYA Console")) - { - AlertDialog.Builder alert = new AlertDialog.Builder(ctx); - alert.setTitle(R.string.ouya_detected); - alert.setMessage(messageId); - alert.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int which) - { - SharedPreferences prefs = UserPreferences.getPreferences(ctx); - SharedPreferences.Editor edit = prefs.edit(); - edit.putBoolean("audio_latency_auto", true); edit.commit(); UserPreferences.updateConfigFile(ctx); } @@ -286,7 +245,6 @@ public final class MainMenuFragment extends PreferenceListFragment implements On SharedPreferences.Editor edit = prefs.edit(); edit.putBoolean("video_threaded", false); edit.putString("video_refresh_rate", Double.toString(59.19132938771038)); - edit.putBoolean("audio_latency_auto", false); edit.commit(); UserPreferences.updateConfigFile(ctx); } @@ -307,7 +265,6 @@ public final class MainMenuFragment extends PreferenceListFragment implements On SharedPreferences prefs = UserPreferences.getPreferences(ctx); SharedPreferences.Editor edit = prefs.edit(); edit.putString("video_refresh_rate", Double.toString(59.65)); - edit.putBoolean("audio_latency_auto", false); edit.commit(); UserPreferences.updateConfigFile(ctx); } diff --git a/android/phoenix/src/com/retroarch/browser/preferences/fragments/AudioPreferenceFragment.java b/android/phoenix/src/com/retroarch/browser/preferences/fragments/AudioPreferenceFragment.java index 07a3981b9b..3db36d05ba 100644 --- a/android/phoenix/src/com/retroarch/browser/preferences/fragments/AudioPreferenceFragment.java +++ b/android/phoenix/src/com/retroarch/browser/preferences/fragments/AudioPreferenceFragment.java @@ -19,13 +19,5 @@ public final class AudioPreferenceFragment extends PreferenceListFragment // Add audio preferences from the XML. addPreferencesFromResource(R.xml.audio_preferences); - - // Disable automatic detection of optimal audio latency if a device is below Android 4.1 - final CheckBoxPreference autoDetectAudioLatency = (CheckBoxPreference) findPreference("audio_latency_auto"); - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) - { - autoDetectAudioLatency.setChecked(false); - autoDetectAudioLatency.setEnabled(false); - } } }