diff options
| author | Andrew Comminos <andrewcomminos@gmail.com> | 2014-08-22 03:11:34 +0400 |
|---|---|---|
| committer | Andrew Comminos <andrewcomminos@gmail.com> | 2014-08-22 03:11:34 +0400 |
| commit | 109c424c0a7f8f29247d2669f29175c8f92e92da (patch) | |
| tree | 61f6c76018a652a8a061e8af785d1bdb805161e5 | |
| parent | a216ea032e59b4d95f4c40d1e70b5d37d4529937 (diff) | |
Fix translation issue with audio sample rates.3.1.4
| -rw-r--r-- | app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/preference_notranslate.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/xml/settings_audio.xml | 2 |
3 files changed, 3 insertions, 18 deletions
diff --git a/app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java b/app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java index 137f446..8658f26 100644 --- a/app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java +++ b/app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java @@ -230,8 +230,8 @@ public class Preferences extends PreferenceActivity { // Scan each bitrate and determine if the device supports it ListPreference inputQualityPreference = (ListPreference) screen.findPreference(Settings.PREF_INPUT_RATE); - String[] bitrateNames = new String[inputQualityPreference.getEntries().length]; - for(int x=0;x<inputQualityPreference.getEntries().length;x++) { + String[] bitrateNames = new String[inputQualityPreference.getEntryValues().length]; + for(int x=0;x<bitrateNames.length;x++) { int bitrate = Integer.parseInt(inputQualityPreference.getEntryValues()[x].toString()); boolean supported = AudioRecord.getMinBufferSize(bitrate, AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT) > 0; bitrateNames[x] = bitrate+"Hz" + (supported ? "" : " (unsupported)"); diff --git a/app/src/main/res/values/preference_notranslate.xml b/app/src/main/res/values/preference_notranslate.xml index a144acc..fc0e13f 100644 --- a/app/src/main/res/values/preference_notranslate.xml +++ b/app/src/main/res/values/preference_notranslate.xml @@ -33,21 +33,6 @@ </string-array> <string-array - name="audioSampleRateNames"> - <!-- Experimental --> - <!--<item>128000Hz (experimental)</item>--> - <!--<item>96000Hz (experimental)</item>--> - <!--<item>72000Hz (experimental)</item>--> - - <item>48000Hz</item> - <item>44100Hz</item> - <item>22050Hz</item> - <item>16000Hz</item> - <item>11025Hz</item> - <item>8000Hz</item> - </string-array> - - <string-array name="audioSampleRateValues"> <!-- Experimental --> <!--<item>128000</item>--> diff --git a/app/src/main/res/xml/settings_audio.xml b/app/src/main/res/xml/settings_audio.xml index 409a672..0c90697 100644 --- a/app/src/main/res/xml/settings_audio.xml +++ b/app/src/main/res/xml/settings_audio.xml @@ -94,7 +94,7 @@ android:defaultValue="48000" android:title="@string/audioSampleRate" android:summary="@string/audioSampleRateSum" - android:entries="@array/audioSampleRateNames" + android:entries="@array/audioSampleRateValues" android:entryValues="@array/audioSampleRateValues"/> <com.morlunk.mumbleclient.preference.SeekBarDialogPreference |