PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev

Browse Source
This commit is contained in:
Michael Wright
2014-08-11 20:47:19 +00:00
committed by Android (Google) Code Review
parent 242b1e51d4 02d501433d
commit ace6dc4f28
1 changed files with 87 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
View File

@@ -564,7 +564,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
private void updateHardKeyboards() { private void updateHardKeyboards() {
mHardKeyboardPreferenceList.clear(); mHardKeyboardPreferenceList.clear();
if (getResources().getConfiguration().keyboard == Configuration.KEYBOARD_QWERTY) {
final int[] devices = InputDevice.getDeviceIds(); final int[] devices = InputDevice.getDeviceIds();
for (int i = 0; i < devices.length; i++) { for (int i = 0; i < devices.length; i++) {
InputDevice device = InputDevice.getDevice(devices[i]); InputDevice device = InputDevice.getDevice(devices[i]);
@@ -594,7 +593,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
mHardKeyboardPreferenceList.add(pref); mHardKeyboardPreferenceList.add(pref);
} }
} }
}
if (!mHardKeyboardPreferenceList.isEmpty()) { if (!mHardKeyboardPreferenceList.isEmpty()) {
for (int i = mHardKeyboardCategory.getPreferenceCount(); i-- > 0; ) { for (int i = mHardKeyboardCategory.getPreferenceCount(); i-- > 0; ) {
@@ -795,7 +793,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
// Hard keyboards // Hard keyboards
InputManager inputManager = (InputManager) context.getSystemService( InputManager inputManager = (InputManager) context.getSystemService(
Context.INPUT_SERVICE); Context.INPUT_SERVICE);
if (resources.getConfiguration().keyboard == Configuration.KEYBOARD_QWERTY) {
boolean hasHardKeyboards = false; boolean hasHardKeyboards = false;
final int[] devices = InputDevice.getDeviceIds(); final int[] devices = InputDevice.getDeviceIds();
@@ -865,7 +862,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
indexable.screenTitle = screenTitle; indexable.screenTitle = screenTitle;
indexables.add(indexable); indexables.add(indexable);
} }
}
// Voice recognizers. // Voice recognizers.
List<ResolveInfo> recognizers = context.getPackageManager() List<ResolveInfo> recognizers = context.getPackageManager()