mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 11:29:50 +02:00
Fix merge
This commit is contained in:
parent
3d4893aba2
commit
e9fe0c85f2
1 changed files with 2 additions and 2 deletions
|
@ -27,7 +27,7 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
|
||||||
|
|
||||||
if (!aecAvailable) {
|
if (!aecAvailable) {
|
||||||
findPreference(PREFERENCE_KEY_AEC).setEnabled(false);
|
findPreference(PREFERENCE_KEY_AEC).setEnabled(false);
|
||||||
updateHifiSetting(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, false);
|
HifiUtils.getInstance().updateHifiSetting(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
getPreferenceScreen().getSharedPreferences().edit().putBoolean(PREFERENCE_KEY_AEC,
|
getPreferenceScreen().getSharedPreferences().edit().putBoolean(PREFERENCE_KEY_AEC,
|
||||||
|
@ -55,7 +55,7 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
|
||||||
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
|
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
|
||||||
switch (key) {
|
switch (key) {
|
||||||
case "aec":
|
case "aec":
|
||||||
updateHifiSetting(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, sharedPreferences.getBoolean(key, false));
|
HifiUtils.getInstance().updateHifiSetting(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, sharedPreferences.getBoolean(key, false));
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue