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

Commit ea0257b3 authored by Manu Cornet's avatar Manu Cornet Committed by Android (Google) Code Review
Browse files

Merge "Slightly better encapsulation for the set of recent activities"

parents ad9d3632 906a3a8e

packages/SystemUI/src/com/android/systemui/recents/Recents.java

+8 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ import com.android.systemui.recents.tv.RecentsTvImpl; 
import com.android.systemui.stackdivider.Divider;



import java.util.ArrayList;

import java.util.HashSet;

import java.util.Set;





/**
@@ -77,6 +79,12 @@ public class Recents extends SystemUI 
    public final static int BIND_TO_SYSTEM_USER_RETRY_DELAY = 5000;

    public final static int RECENTS_GROW_TARGET_INVALID = -1;



    public final static Set<String> RECENTS_ACTIVITIES = new HashSet<>();

    static {

        RECENTS_ACTIVITIES.add(RecentsImpl.RECENTS_ACTIVITY);

        RECENTS_ACTIVITIES.add(RecentsTvImpl.RECENTS_TV_ACTIVITY);

    }



    // Purely for experimentation

    private final static String RECENTS_OVERRIDE_SYSPROP_KEY = "persist.recents_override_pkg";

    private final static String ACTION_SHOW_RECENTS = "com.android.systemui.recents.ACTION_SHOW";

packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java

+2 −2
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ import com.android.internal.os.BackgroundThread; 
import com.android.systemui.R;

import com.android.systemui.pip.tv.PipMenuActivity;

import com.android.systemui.pip.tv.PipOnboardingActivity;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsDebugFlags;

import com.android.systemui.recents.RecentsImpl;

import com.android.systemui.recents.model.Task;
@@ -416,8 +417,7 @@ public class SystemServicesProxy { 
            }

            return (homeStackVisibleNotOccluded && topActivity != null

                    && topActivity.getPackageName().equals(RecentsImpl.RECENTS_PACKAGE)

                    && (topActivity.getClassName().equals(RecentsImpl.RECENTS_ACTIVITY)

                        || topActivity.getClassName().equals(RecentsTvImpl.RECENTS_TV_ACTIVITY)));

                    && Recents.RECENTS_ACTIVITIES.contains(topActivity.getClassName()));

        } catch (RemoteException e) {

            e.printStackTrace();

        }