diff options
author | 2011-12-09 11:00:44 -0800 | |
---|---|---|
committer | 2011-12-09 11:00:44 -0800 | |
commit | 7ce1dc33132f641b5dca86e5c1aff1108ae9b1ed (patch) | |
tree | 2566626e032f25a165e774dcbbdcf1d876522bd9 /java/src/com/android/inputmethod/latin/Settings.java | |
parent | 7fa66d6b78097416d12e2e296f8c9e11f23ea4dc (diff) | |
parent | 0c3b8ce842140aad2087b6ec391177999b87cbb4 (diff) | |
download | latinime-7ce1dc33132f641b5dca86e5c1aff1108ae9b1ed.tar.gz latinime-7ce1dc33132f641b5dca86e5c1aff1108ae9b1ed.tar.xz latinime-7ce1dc33132f641b5dca86e5c1aff1108ae9b1ed.zip |
am 0c3b8ce8: Merge "Move settings method from Utils to SettingsValues"
* commit '0c3b8ce842140aad2087b6ec391177999b87cbb4':
Move settings method from Utils to SettingsValues
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Settings.java')
-rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 9f2f317c3..6558c3ca3 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -456,7 +456,7 @@ public class Settings extends InputMethodSettingsActivity SharedPreferences sp, Resources res) { if (mKeypressVibrationDurationSettingsPref != null) { mKeypressVibrationDurationSettingsPref.setSummary( - Utils.getCurrentVibrationDuration(sp, res) + SettingsValues.getCurrentVibrationDuration(sp, res) + res.getString(R.string.settings_ms)); } } @@ -484,7 +484,7 @@ public class Settings extends InputMethodSettingsActivity }); final View v = context.getLayoutInflater().inflate( R.layout.vibration_settings_dialog, null); - final int currentMs = Utils.getCurrentVibrationDuration( + final int currentMs = SettingsValues.getCurrentVibrationDuration( getPreferenceManager().getSharedPreferences(), getResources()); mKeypressVibrationDurationSettingsTextView = (TextView)v.findViewById(R.id.vibration_value); final SeekBar sb = (SeekBar)v.findViewById(R.id.vibration_settings); @@ -513,8 +513,8 @@ public class Settings extends InputMethodSettingsActivity private void updateKeypressSoundVolumeSummary(SharedPreferences sp, Resources res) { if (mKeypressSoundVolumeSettingsPref != null) { - mKeypressSoundVolumeSettingsPref.setSummary( - String.valueOf((int)(Utils.getCurrentKeypressSoundVolume(sp, res) * 100))); + mKeypressSoundVolumeSettingsPref.setSummary(String.valueOf( + (int)(SettingsValues.getCurrentKeypressSoundVolume(sp, res) * 100))); } } @@ -543,7 +543,7 @@ public class Settings extends InputMethodSettingsActivity }); final View v = context.getLayoutInflater().inflate( R.layout.sound_effect_volume_dialog, null); - final int currentVolumeInt = (int)(Utils.getCurrentKeypressSoundVolume( + final int currentVolumeInt = (int)(SettingsValues.getCurrentKeypressSoundVolume( getPreferenceManager().getSharedPreferences(), getResources()) * 100); mKeypressSoundVolumeSettingsTextView = (TextView)v.findViewById(R.id.sound_effect_volume_value); |