diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/ApplicationSettings.java | 7 | ||||
| -rw-r--r-- | src/com/android/settings/quicklaunch/QuickLaunchSettings.java | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java index ed7c7a085..da417ec56 100644 --- a/src/com/android/settings/ApplicationSettings.java +++ b/src/com/android/settings/ApplicationSettings.java @@ -32,7 +32,6 @@ public class ApplicationSettings extends SettingsPreferenceFragment implements private static final String KEY_TOGGLE_INSTALL_APPLICATIONS = "toggle_install_applications"; private static final String KEY_APP_INSTALL_LOCATION = "app_install_location"; - private static final String KEY_QUICK_LAUNCH = "quick_launch"; // App installation location. Default is ask the user. private static final int APP_INSTALL_AUTO = 0; @@ -74,12 +73,6 @@ public class ApplicationSettings extends SettingsPreferenceFragment implements } }); } - - if (getResources().getConfiguration().keyboard == Configuration.KEYBOARD_NOKEYS) { - // No hard keyboard, remove the setting for quick launch - Preference quickLaunchSetting = findPreference(KEY_QUICK_LAUNCH); - getPreferenceScreen().removePreference(quickLaunchSetting); - } } protected void handleUpdateAppInstallLocation(final String value) { diff --git a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java index 2d2b01cd7..47fa34a2e 100644 --- a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java +++ b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java @@ -263,7 +263,7 @@ public class QuickLaunchSettings extends PreferenceActivity implements /** Whether the shortcut has been seen already. The array index is the shortcut. */ SparseBooleanArray shortcutSeen = new SparseBooleanArray(); - KeyCharacterMap keyMap = KeyCharacterMap.load(KeyCharacterMap.BUILT_IN_KEYBOARD); + KeyCharacterMap keyMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD); // Go through all the key codes and create a preference for the appropriate keys for (int keyCode = KeyEvent.getMaxKeyCode() - 1; keyCode >= 0; keyCode--) { |