Merge change I5289d45d into eclair
* changes:
Update a couple of wallpapers.
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 52d89c3e..3768966 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -418,13 +418,7 @@
// itself again.
mWorkspace.post(new Runnable() {
public void run() {
- ISearchManager searchManagerService = ISearchManager.Stub.asInterface(
- ServiceManager.getService(Context.SEARCH_SERVICE));
- try {
- searchManagerService.stopSearch();
- } catch (RemoteException e) {
- Log.e(TAG, "error stopping search", e);
- }
+ stopSearch();
}
});
}
diff --git a/src/com/android/launcher2/Search.java b/src/com/android/launcher2/Search.java
index f963048..283042d 100644
--- a/src/com/android/launcher2/Search.java
+++ b/src/com/android/launcher2/Search.java
@@ -253,7 +253,8 @@
if (animation.hasEnded()
&& animation.getFillAfter()
&& animation.willChangeBounds()) {
- ((View) getParent()).invalidate();
+ View parent = (View) getParent();
+ if (parent != null) parent.invalidate();
} else {
invalidate();
}