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

Commit 2da59ffb authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #5192141: systemui asplodes after enough tapping on the windowlist button"

parents 192df696 cfb9f2bc

core/java/android/app/ActivityThread.java

+0 −1
Original line number Diff line number Diff line
@@ -1943,7 +1943,6 @@ public final class ActivityThread { 
        // we are back active so skip it.

        unscheduleGcIdler();



        Slog.i(TAG, "Launch: profileFd=" + r.profileFile + " stop=" + r.autoStopProfiler);

        if (r.profileFd != null) {

            mBoundApplication.setProfiler(r.profileFile, r.profileFd);

            mBoundApplication.startProfiling();

packages/SystemUI/res/anim/recent_appear.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 


<alpha xmlns:android="http://schemas.android.com/apk/res/android"

    android:fromAlpha="0.0" android:toAlpha="1.0"

    android:duration="@android:integer/config_shortAnimTime"

    android:duration="@android:integer/config_mediumAnimTime"

    />

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

+4 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.View; 
    // should group this into a multi-property animation

    private static final int OPEN_DURATION = 136;

    private static final int CLOSE_DURATION = 250;

    private static final int SCRIM_DURATION = 400;

    private static final String TAG = RecentsPanelView.TAG;

    private static final boolean DEBUG = RecentsPanelView.DEBUG;
@@ -71,12 +72,14 @@ import android.view.View; 
        posAnim.setInterpolator(appearing

                ? new android.view.animation.DecelerateInterpolator(2.5f)

                : new android.view.animation.AccelerateInterpolator(2.5f));

        posAnim.setDuration(appearing ? OPEN_DURATION : CLOSE_DURATION);



        Animator glowAnim = ObjectAnimator.ofFloat(mContentView, "alpha",

                mContentView.getAlpha(), appearing ? 1.0f : 0.0f);

        glowAnim.setInterpolator(appearing

                ? new android.view.animation.AccelerateInterpolator(1.0f)

                : new android.view.animation.DecelerateInterpolator(1.0f));

        glowAnim.setDuration(appearing ? OPEN_DURATION : CLOSE_DURATION);



        mContentAnim = new AnimatorSet();

        final Builder builder = mContentAnim.play(glowAnim).with(posAnim);
@@ -84,9 +87,9 @@ import android.view.View; 
        if (background != null) {

            Animator bgAnim = ObjectAnimator.ofInt(background,

                "alpha", appearing ? 0 : 255, appearing ? 255 : 0);

            bgAnim.setDuration(appearing ? SCRIM_DURATION : CLOSE_DURATION);

            builder.with(bgAnim);

        }

        mContentAnim.setDuration(appearing ? OPEN_DURATION : CLOSE_DURATION);

        mContentAnim.addListener(this);

        if (mListener != null) {

            mContentAnim.addListener(mListener);

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

+2 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.graphics.RectF; 
import android.graphics.Shader.TileMode;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.LayerDrawable;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.Handler;
@@ -497,7 +496,7 @@ public class RecentsPanelView extends RelativeLayout 
        synchronized (ad) {

            ad.mLabel = label;

            ad.mIcon = icon;

            ad.setThumbnail(thumbs.mainThumbnail);

            ad.setThumbnail(thumbs != null ? thumbs.mainThumbnail : null);

        }

    }
@@ -591,7 +590,7 @@ public class RecentsPanelView extends RelativeLayout 
                            ActivityDescription ad = descriptions.get(i);

                            loadActivityDescription(ad, i);

                            long now = SystemClock.uptimeMillis();

                            nextTime += 200;

                            nextTime += 150;

                            if (nextTime > now) {

                                try {

                                    Thread.sleep(nextTime-now);

services/java/com/android/server/am/TaskRecord.java

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ class TaskRecord extends ThumbnailHolder { 
        if (!askedCompatMode) {

            pw.print(prefix); pw.print("askedCompatMode="); pw.println(askedCompatMode);

        }

        pw.print(prefix); pw.print("lastThumbnail="); pw.print(lastThumbnail);

                pw.print(" lastDescription="); pw.println(lastDescription);

        pw.print(prefix); pw.print("lastActiveTime="); pw.print(lastActiveTime);

                pw.print(" (inactive for ");

                pw.print((getInactiveDuration()/1000)); pw.println("s)");