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

Commit ca2af9e3 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Only make Recents activity invisible if not focused on TV devices. 

Change was introduced in b/28246419 to fix Recents activity visibility
issues on TV, but was causing other issues on phones. So, only apply
rule on TV devices.

Bug: 28246419
Bug: 28943853
Change-Id: Icd19eae4ffa5e0a798bc9f63bc7a6c9a60422236
parent 72f19ff6

services/core/java/com/android/server/am/ActivityManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ import static android.app.ActivityManager.StackId.INVALID_STACK_ID; 
import static android.app.ActivityManager.StackId.LAST_STATIC_STACK_ID;

import static android.app.ActivityManager.StackId.PINNED_STACK_ID;

import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT;

import static android.content.pm.PackageManager.FEATURE_LEANBACK_ONLY;

import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE;

import static android.content.pm.PackageManager.GET_PROVIDERS;

import static android.content.pm.PackageManager.MATCH_DEBUG_TRIAGED_MISSING;
@@ -1344,6 +1345,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
    boolean mSupportsMultiWindow;

    boolean mSupportsFreeformWindowManagement;

    boolean mSupportsPictureInPicture;

    boolean mSupportsLeanbackOnly;

    Rect mDefaultPinnedStackBounds;

    IActivityController mController = null;

    boolean mControllerIsAMonkey = false;
@@ -12785,6 +12787,9 @@ public final class ActivityManagerService extends ActivityManagerNative 
        final boolean forceRtl = Settings.Global.getInt(resolver, DEVELOPMENT_FORCE_RTL, 0) != 0;

        final boolean forceResizable = Settings.Global.getInt(

                resolver, DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, 0) != 0;

        final boolean supportsLeanbackOnly =

                mContext.getPackageManager().hasSystemFeature(FEATURE_LEANBACK_ONLY);















        // Transfer any global setting for forcing RTL layout, into a System Property















        SystemProperties.set(DEVELOPMENT_FORCE_RTL, forceRtl ? "1":"0");























@@ -12800,6 +12805,7 @@ public final class ActivityManagerService extends ActivityManagerNative













            mWaitForDebugger = mOrigWaitForDebugger = waitForDebugger;















            mAlwaysFinishActivities = alwaysFinishActivities;















            mLenientBackgroundCheck = lenientBackgroundCheck;













            mSupportsLeanbackOnly = supportsLeanbackOnly;















            mForceResizableActivities = forceResizable;















            mWindowManager.setForceResizableTasks(mForceResizableActivities);















            if (supportsMultiWindow || forceResizable) {

























services/core/java/com/android/server/am/ActivityStack.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -1832,9 +1832,9 @@ final class ActivityStack {













        boolean isVisible =















                !behindFullscreenActivity || r.mLaunchTaskBehind || activityVisibleBehind;





























        if (isVisible && r.isRecentsActivity()) {













            // Recents activity can only be visible if the home stack is the focused stack or we are













            // in split-screen mode.













        if (mService.mSupportsLeanbackOnly && isVisible && r.isRecentsActivity()) {













            // On devices that support leanback only (Android TV), Recents activity can only be













            // visible if the home stack is the focused stack or we are in split-screen mode.















            isVisible = mStackSupervisor.getStack(DOCKED_STACK_ID) != null















                    || mStackSupervisor.isFocusedStack(this);















        }