diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-10-19 09:06:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-19 09:06:49 -0700 |
| commit | e9687ba8bdccc27f98fe1dcdc48faac0c0de4c18 (patch) | |
| tree | a3cecc7bed992a1cc9ee154110258d945a4e215a /packages/SystemUI/src/com/android/systemui/statusbar | |
| parent | 80343f646f9686528212f82163a77ef48e30f4c3 (diff) | |
| parent | 738cfc91053fc888397ec2d139e0798f8c95b3ca (diff) | |
| download | frameworks_base-e9687ba8bdccc27f98fe1dcdc48faac0c0de4c18.zip frameworks_base-e9687ba8bdccc27f98fe1dcdc48faac0c0de4c18.tar.gz frameworks_base-e9687ba8bdccc27f98fe1dcdc48faac0c0de4c18.tar.bz2 | |
Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 7dbe44b..f38af5c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -481,10 +481,8 @@ public abstract class BaseStatusBar extends SystemUI implements | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); if (firstTask == null) { - ActivityOptions opts = ActivityOptions.makeCustomAnimation(mContext, - R.anim.recents_launch_from_launcher_enter, - R.anim.recents_launch_from_launcher_exit); - mContext.startActivityAsUser(intent, opts.toBundle(), new UserHandle( + // The correct window animation will be applied via the activity's style + mContext.startActivityAsUser(intent, new UserHandle( UserHandle.USER_CURRENT)); } else { Bitmap first = firstTask.getThumbnail(); |