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

Commit e43edc74 authored by Zak Cohen's avatar Zak Cohen Committed by Android (Google) Code Review
Browse files

Merge "Sets a simple locus id when Overview is enabled" into sc-dev

parents bef29071 e2c4687e

quickstep/src/com/android/quickstep/RecentsActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> { 
        // onActivityStart callback.

        mFallbackRecentsView.setContentAlpha(1);

        super.onStart();

        mFallbackRecentsView.updateLocusId();

    }



    @Override
@@ -276,6 +277,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> { 


        // Workaround for b/78520668, explicitly trim memory once UI is hidden

        onTrimMemory(TRIM_MEMORY_UI_HIDDEN);

        mFallbackRecentsView.updateLocusId();

    }



    @Override

quickstep/src/com/android/quickstep/views/RecentsView.java

+18 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.animation.ValueAnimator; 
import android.annotation.TargetApi;

import android.app.ActivityManager.RunningTaskInfo;

import android.content.Context;

import android.content.LocusId;

import android.content.res.Configuration;

import android.graphics.BlendMode;

import android.graphics.Canvas;
@@ -75,6 +76,7 @@ import android.graphics.RectF; 
import android.graphics.Typeface;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.os.Bundle;

import android.os.UserHandle;

import android.text.Layout;

import android.text.StaticLayout;
@@ -943,6 +945,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                cancelSplitSelect(false);

            }

        }

        updateLocusId();

    }



    /**
@@ -3859,4 +3862,19 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
    public RecentsAnimationController getRecentsAnimationController() {

        return mRecentsAnimationController;

    }



    /** Update the current activity locus id to show the enabled state of Overview */

    public void updateLocusId() {

        String locusId = "Overview";



        if (mOverviewStateEnabled && mActivity.isStarted()) {

            locusId += "|ENABLED";

        } else {

            locusId += "|DISABLED";

        }



        final LocusId id = new LocusId(locusId);

        // Set locus context is a binder call, don't want it to happen during a transition

        UI_HELPER_EXECUTOR.post(() -> mActivity.setLocusContext(id, Bundle.EMPTY));

    }

}