From 833808d0c69be8533759afdaa8ca4c004835f6a0 Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Fri, 19 Oct 2012 19:12:29 +0200 Subject: Fix transition into Recents with live wallpaper Fixes regression introduced by: 738cfc91053fc888397ec2d139e0798f8c95b3ca (Fixing wallpaper flash when going in/out of Recents) --- .../com/android/systemui/statusbar/BaseStatusBar.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'packages/SystemUI/src/com/android/systemui/statusbar') diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index f38af5c..fe33b02 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -36,7 +36,6 @@ import android.app.ActivityManagerNative; import android.app.ActivityOptions; import android.app.KeyguardManager; import android.app.PendingIntent; -import android.app.Service; import android.app.TaskStackBuilder; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; @@ -81,7 +80,6 @@ import android.widget.RemoteViews; import android.widget.TextView; import java.util.ArrayList; -import java.util.List; public abstract class BaseStatusBar extends SystemUI implements CommandQueue.Callbacks { @@ -481,9 +479,18 @@ public abstract class BaseStatusBar extends SystemUI implements | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); if (firstTask == null) { - // The correct window animation will be applied via the activity's style - mContext.startActivityAsUser(intent, new UserHandle( - UserHandle.USER_CURRENT)); + if (RecentsActivity.forceOpaqueBackground(mContext)) { + 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( + UserHandle.USER_CURRENT)); + } else { + // 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(); final Resources res = mContext.getResources(); -- cgit v1.1