am c90181d6: Use system default key press volume

* commit 'c90181d6aa42c4c0b56ccc21528dcef84d186c53':
  Use system default key press volume
main
Tadashi G. Takaoka 2013-06-18 09:05:47 -07:00 committed by Android Git Automerger
commit 6e86ebe822
2 changed files with 5 additions and 2 deletions

View File

@ -26,7 +26,7 @@
<item>HARDWARE=grouper,0.3f</item> <item>HARDWARE=grouper,0.3f</item>
<item>HARDWARE=mako,0.3f</item> <item>HARDWARE=mako,0.3f</item>
<item>HARDWARE=manta,0.2f</item> <item>HARDWARE=manta,0.2f</item>
<!-- Default value for unknown device --> <!-- Default value for unknown device. The negative value means system default. -->
<item>,0.2f</item> <item>,-1.0f</item>
</string-array> </string-array>
</resources> </resources>

View File

@ -453,6 +453,9 @@ public final class SettingsFragment extends InputMethodSettingsFragment
@Override @Override
public String getValueText(final int value) { public String getValueText(final int value) {
if (value < 0) {
return res.getString(R.string.settings_system_default);
}
return Integer.toString(value); return Integer.toString(value);
} }