Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dad395c authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev

parents 61e42262 833808d0

packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java

+5 −1
Original line number Diff line number Diff line
@@ -113,10 +113,14 @@ public class RecentsActivity extends Activity { 
        }

    }



    public static boolean forceOpaqueBackground(Context context) {

        return WallpaperManager.getInstance(context).getWallpaperInfo() != null;

    }



    @Override

    public void onStart() {

        // Hide wallpaper if it's not a static image

        if (WallpaperManager.getInstance(this).getWallpaperInfo() != null) {

        if (forceOpaqueBackground(this)) {

            updateWallpaperVisibility(false);

        } else {

            updateWallpaperVisibility(true);

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+12 −5
Original line number Diff line number Diff line
@@ -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) {

                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();