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

Commit 13c00802 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Merge "Only make Recents activity invisible if not focused on TV... 

Merge "Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev am: 20237bc6 am: b3c7e1c4" into nyc-mr1-dev-plus-aosp
am: b1aa5535

* commit 'b1aa5535':
  Only make Recents activity invisible if not focused on TV devices.

Change-Id: I6bbcbbef25be062b187e0129cc04a6218453aa8b
parents 4bc5d990 b1aa5535

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;
@@ -12813,6 +12815,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");























@@ -12828,6 +12833,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);















        }