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

Merge "Show quick launch settings always."

Browse Source
This commit is contained in:
Jeff Brown
2010-12-09 15:02:18 -08:00
committed by Android (Google) Code Review
parent aba39c0987 819dff1c18
commit 97c01af22b
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/ApplicationSettings.java
View File

@@ -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_TOGGLE_INSTALL_APPLICATIONS = "toggle_install_applications";
private static final String KEY_APP_INSTALL_LOCATION = "app_install_location"; 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. // App installation location. Default is ask the user.
private static final int APP_INSTALL_AUTO = 0; 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) { protected void handleUpdateAppInstallLocation(final String value) {

2
src/com/android/settings/quicklaunch/QuickLaunchSettings.java
View File

@@ -263,7 +263,7 @@ public class QuickLaunchSettings extends PreferenceActivity implements
/** Whether the shortcut has been seen already. The array index is the shortcut. */ /** Whether the shortcut has been seen already. The array index is the shortcut. */
SparseBooleanArray shortcutSeen = new SparseBooleanArray(); 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 // Go through all the key codes and create a preference for the appropriate keys
for (int keyCode = KeyEvent.getMaxKeyCode() - 1; keyCode >= 0; keyCode--) { for (int keyCode = KeyEvent.getMaxKeyCode() - 1; keyCode >= 0; keyCode--) {