summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-02-19 10:57:35 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-02-19 10:57:35 -0800
commit233a0136ea1fe86c61f02eb7b60dd2a9e3af4d91 (patch)
treeddbf0fb42445915d6573a41d09eb01035c6a60a1 /src
parent98baae654dc6e69eecb5ffab2f86c5ab217a762c (diff)
downloadandroid_packages_apps_Trebuchet-233a0136ea1fe86c61f02eb7b60dd2a9e3af4d91.tar.gz
android_packages_apps_Trebuchet-233a0136ea1fe86c61f02eb7b60dd2a9e3af4d91.tar.bz2
android_packages_apps_Trebuchet-233a0136ea1fe86c61f02eb7b60dd2a9e3af4d91.zip
auto import from //branches/cupcake/...@132276
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher/Launcher.java18
-rw-r--r--src/com/android/launcher/Search.java4
-rw-r--r--src/com/android/launcher/WallpaperChooser.java2
3 files changed, 18 insertions, 6 deletions
diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index 4252daecf..58fcd5a28 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -355,11 +355,21 @@ public final class Launcher extends Activity implements View.OnClickListener, On
}
return handled;
}
+ private boolean acceptFilter() {
+ final Configuration configuration = getResources().getConfiguration();
+ final boolean keyboardShowing = configuration.keyboardHidden !=
+ Configuration.KEYBOARDHIDDEN_YES;
+ final boolean hasKeyboard = configuration.keyboard != Configuration.KEYBOARD_NOKEYS;
+ final InputMethodManager inputManager = (InputMethodManager)
+ getSystemService(Context.INPUT_METHOD_SERVICE);
+ return (hasKeyboard && keyboardShowing) ||
+ (!hasKeyboard && !inputManager.isFullscreenMode());
+ }
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
boolean handled = super.onKeyDown(keyCode, event);
- if (!handled && keyCode != KeyEvent.KEYCODE_ENTER) {
+ if (!handled && acceptFilter() && keyCode != KeyEvent.KEYCODE_ENTER) {
boolean gotKey = TextKeyListener.getInstance().onKeyDown(mWorkspace, mDefaultKeySsb,
keyCode, event);
if (gotKey && mDefaultKeySsb != null && mDefaultKeySsb.length() > 0) {
@@ -861,8 +871,10 @@ public final class Launcher extends Activity implements View.OnClickListener, On
startWallpaper();
return true;
case MENU_SEARCH:
- if (!mWorkspace.snapToSearch()) {
- onSearchRequested();
+ if (mWorkspace.snapToSearch()) {
+ closeDrawer(true); // search gadget: get drawer out of the way
+ } else {
+ onSearchRequested(); // no search gadget: use system search UI
}
return true;
case MENU_NOTIFICATIONS:
diff --git a/src/com/android/launcher/Search.java b/src/com/android/launcher/Search.java
index 449caf997..d33fd69fa 100644
--- a/src/com/android/launcher/Search.java
+++ b/src/com/android/launcher/Search.java
@@ -343,9 +343,9 @@ public class Search extends LinearLayout implements OnClickListener, OnKeyListen
if (mSearchable.getVoiceSearchEnabled() && mSearchable.getVoiceSearchLaunchWebSearch()) {
// Enable the voice search button if there is an activity that can handle it
PackageManager pm = getContext().getPackageManager();
- List<ResolveInfo> list = pm.queryIntentActivities(mVoiceSearchIntent,
+ ResolveInfo ri = pm.resolveActivity(mVoiceSearchIntent,
PackageManager.MATCH_DEFAULT_ONLY);
- voiceSearchVisible = list.size() > 0;
+ voiceSearchVisible = ri != null;
}
// finally, set visible state of voice search button, as appropriate
diff --git a/src/com/android/launcher/WallpaperChooser.java b/src/com/android/launcher/WallpaperChooser.java
index c88a02a61..9ac922cba 100644
--- a/src/com/android/launcher/WallpaperChooser.java
+++ b/src/com/android/launcher/WallpaperChooser.java
@@ -60,7 +60,7 @@ public class WallpaperChooser extends Activity implements AdapterView.OnItemSele
};
private static final Integer[] IMAGE_IDS = {
- R.drawable.wallpaper_lake,
+ com.android.internal.R.drawable.default_wallpaper,
R.drawable.wallpaper_sunset,
R.drawable.wallpaper_beach,
R.drawable.wallpaper_snow_leopard,