Merge "Show quick launch settings always."
diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java
index ed7c7a0..da417ec 100644
--- a/src/com/android/settings/ApplicationSettings.java
+++ b/src/com/android/settings/ApplicationSettings.java
@@ -32,7 +32,6 @@
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 @@
}
});
}
-
- 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 2d2b01c..47fa34a 100644
--- a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
+++ b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
@@ -263,7 +263,7 @@
/** 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--) {