Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9f1ae205: am 06bc9721: Merge "Disable soft keyboard when keyboard attached." into honeycomb

Browse Source 
* commit '9f1ae205b40a2cc730b3e07b1a408ad2803c40fd':
  Disable soft keyboard when keyboard attached.
This commit is contained in:
Jeff Brown
2011-01-16 10:41:22 -08:00
committed by Android Git Automerger
parent 48eea948dc 9f1ae205b4
commit ddb16aa8a6
4 changed files with 61 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/com/android/internal/view/menu/MenuBuilder.java
View File

@@ -353,8 +353,7 @@ public class MenuBuilder implements Menu {
mNonActionItems = new ArrayList<MenuItemImpl>();
mIsActionItemsStale = true;
mShortcutsVisible =
(mResources.getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS);
setShortcutsVisibleInner(true);
}
public MenuBuilder setDefaultShowAsAction(int defaultShowAsAction) {
@@ -782,14 +781,18 @@ public class MenuBuilder implements Menu {
*/
public void setShortcutsVisible(boolean shortcutsVisible) {
if (mShortcutsVisible == shortcutsVisible) return;
mShortcutsVisible =
(mResources.getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS)
&& shortcutsVisible;
setShortcutsVisibleInner(shortcutsVisible);
refreshShortcuts(mShortcutsVisible, isQwertyMode());
}
private void setShortcutsVisibleInner(boolean shortcutsVisible) {
mShortcutsVisible = shortcutsVisible
&& mResources.getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS
&& mResources.getBoolean(
com.android.internal.R.bool.config_showMenuShortcutsWhenKeyboardPresent);
}
/**
* @return Whether shortcuts should be visible on menus.
*/