Merge "Fix order of buttons for device admin toggle"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a120b64..e39da52 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2546,9 +2546,7 @@
<!-- User dictionary settings. The title of the context menu item to delete the current word -->
<string name="user_dict_settings_context_menu_delete_title">Delete</string>
<!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary [CHAR LIMIT=200] -->
- <string name="user_dict_settings_empty_text" product="tablet">You do not have any words in the user dictionary. You can add a word by touching the Add ( + ) button.</string>
- <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary [CHAR LIMIT=200] -->
- <string name="user_dict_settings_empty_text" product="default">You do not have any words in the user dictionary. You can add a word through the menu.</string>
+ <string name="user_dict_settings_empty_text">You do not have any words in the user dictionary. You can add a word by touching the Add ( + ) button.</string>
<!-- User dictionary settings. The text to show to describe the dictionary common to all languages -->
<string name="user_dict_settings_all_languages">All languages</string>
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index a626903..22c05ca 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -58,7 +58,6 @@
private static final int MSG_RINGER_MODE_CHANGED = 101;
private SeekBarVolumizer [] mSeekBarVolumizer;
- private boolean mIgnoreVolumeKeys;
// These arrays must all match in length and order
private static final int[] SEEKBAR_ID = new int[] {
@@ -145,7 +144,6 @@
//setDialogIcon(R.drawable.ic_settings_sound);
mSeekBarVolumizer = new SeekBarVolumizer[SEEKBAR_ID.length];
- mIgnoreVolumeKeys = !Utils.isVoiceCapable(context);
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
}
@@ -242,11 +240,7 @@
case KeyEvent.KEYCODE_VOLUME_DOWN:
case KeyEvent.KEYCODE_VOLUME_UP:
case KeyEvent.KEYCODE_VOLUME_MUTE:
- if (mIgnoreVolumeKeys) {
- return true;
- } else {
- return super.onKey(v, keyCode, event);
- }
+ return true;
default:
return false;
}