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

Commit 013faac0 authored by Massimo Carli's avatar Massimo Carli Committed by Automerger Merge Worker
Browse files

Merge "Handle tranlucent strategy on back" into tm-qpr-dev am: 0b5d2db6 am: dd940995 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21154290



Change-Id: I1bbb6851ea28ce530821300a06544130d17fd502
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cfbbfd6f dd940995

services/core/java/com/android/server/wm/ActivityRecord.java

+4 −0
Original line number Diff line number Diff line
@@ -3919,6 +3919,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

    }



    boolean isFinishing() {

        return finishing;

    }



    /**

     * This method is to only be called from the client via binder when the activity is destroyed

     * AND finished.

services/core/java/com/android/server/wm/LetterboxUiController.java

+6 −1
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ import com.android.server.wm.LetterboxConfiguration.LetterboxBackgroundType; 


import java.io.PrintWriter;

import java.util.function.BooleanSupplier;

import java.util.function.Predicate;



/** Controls behaviour of the letterbox UI for {@link mActivityRecord}. */

// TODO(b/185262487): Improve test coverage of this class. Parts of it are tested in
@@ -114,6 +115,9 @@ import java.util.function.BooleanSupplier; 
// TODO(b/263021211): Consider renaming to more generic CompatUIController.

final class LetterboxUiController {



    private static final Predicate<ActivityRecord> FIRST_OPAQUE_NOT_FINISHING_ACTIVITY_PREDICATE =

            activityRecord -> activityRecord.fillsParent() && !activityRecord.isFinishing();



    private static final String TAG = TAG_WITH_CLASS_NAME ? "LetterboxUiController" : TAG_ATM;



    private static final float UNDEFINED_ASPECT_RATIO = 0f;
@@ -1390,7 +1394,8 @@ final class LetterboxUiController { 
            return;

        }

        final ActivityRecord firstOpaqueActivityBeneath = mActivityRecord.getTask().getActivity(

                ActivityRecord::fillsParent, mActivityRecord, false /* includeBoundary */,

                FIRST_OPAQUE_NOT_FINISHING_ACTIVITY_PREDICATE /* callback */,

                mActivityRecord /* boundary */, false /* includeBoundary */,

                true /* traverseTopToBottom */);

        if (firstOpaqueActivityBeneath == null) {

            // We skip letterboxing if the translucent activity doesn't have any opaque

services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java

+16 −0
Original line number Diff line number Diff line
@@ -259,6 +259,22 @@ public class SizeCompatTests extends WindowTestsBase { 
        assertFalse(translucentActivity.inSizeCompatMode());

    }



    @Test

    public void testCheckOpaqueIsLetterboxedWhenStrategyIsApplied() {

        mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);

        setUpDisplaySizeWithApp(2000, 1000);

        prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT);

        mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);

        // Translucent Activity

        final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)

                .setLaunchedFromUid(mActivity.getUid())

                .build();

        doReturn(false).when(translucentActivity).fillsParent();

        spyOn(mActivity);

        mTask.addChild(translucentActivity);

        verify(mActivity).isFinishing();

    }



    @Test

    public void testRestartProcessIfVisible() {

        setUpDisplaySizeWithApp(1000, 2500);