| commit | 54b58d9eafca4c944cc0c67f67240aa657fbe4c0 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Tue Nov 24 09:29:21 2009 -0800 |
| committer | The Android Automerger <android-build@android.com> | Tue Nov 24 09:29:21 2009 -0800 |
| tree | e0b6007fd80855457d7b602d38300732298f0956 | |
| parent | 6d8151e32d287c7d4390d7461072196812e62c1c [diff] | |
| parent | 09cf7d19db69dc4ac0f3457590e8df539bfec7d1 [diff] |
Merge branch 'eclair' into eclair-release
diff --git a/res/drawable-hdpi/wallpaper_lightgrad.jpg b/res/drawable-hdpi/wallpaper_lightgrad.jpg index b11f253..b8eea0b 100644 --- a/res/drawable-hdpi/wallpaper_lightgrad.jpg +++ b/res/drawable-hdpi/wallpaper_lightgrad.jpg Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_lightgrad_small.jpg b/res/drawable-hdpi/wallpaper_lightgrad_small.jpg index 4e53bf7..b686c8d 100644 --- a/res/drawable-hdpi/wallpaper_lightgrad_small.jpg +++ b/res/drawable-hdpi/wallpaper_lightgrad_small.jpg Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_pcut.jpg b/res/drawable-hdpi/wallpaper_pcut.jpg index c2e8ba1..ccd72ca 100644 --- a/res/drawable-hdpi/wallpaper_pcut.jpg +++ b/res/drawable-hdpi/wallpaper_pcut.jpg Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_pcut_small.jpg b/res/drawable-hdpi/wallpaper_pcut_small.jpg index e520ab0..e325810 100644 --- a/res/drawable-hdpi/wallpaper_pcut_small.jpg +++ b/res/drawable-hdpi/wallpaper_pcut_small.jpg Binary files differ
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(); }
