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

Commit 51c48c55 authored by Graciela Wissen Putri's avatar Graciela Wissen Putri Committed by Graciela Putri
Browse files

Revert^2 "Disable user aspect ratio button if app not launchable" 

We exclude apps that do not have launchable activities in Settings >
Apps > Aspect ratio (experimental), so we should not show user aspect
ratio button in apps that do not have a launcher category.

This will remove button from showing in DeviceAsWebcam and Android Auto
transparent activity pop-up.

Bug: 308391262
Test: atest UserAspectRatioSettingsWindowManagerTest
      Steps in b/309377965 & b/309370256
Change-Id: I620bd2c7c8154dff42ce59fba81b109fcba447ac
parent 6ea41f31

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsWindowManager.java

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.app.TaskInfo;

import android.content.Context;

import android.content.Intent;

import android.graphics.Rect;

import android.os.SystemClock;

import android.view.LayoutInflater;
@@ -227,9 +228,12 @@ class UserAspectRatioSettingsWindowManager extends CompatUIWindowManagerAbstract 
    }



    private boolean getHasUserAspectRatioSettingsButton(@NonNull TaskInfo taskInfo) {

        final Intent intent = taskInfo.baseIntent;

        return taskInfo.appCompatTaskInfo.topActivityEligibleForUserAspectRatioButton

                && (taskInfo.appCompatTaskInfo.topActivityBoundsLetterboxed

                    || taskInfo.appCompatTaskInfo.isUserFullscreenOverrideEnabled)

                && Intent.ACTION_MAIN.equals(intent.getAction())

                && intent.hasCategory(Intent.CATEGORY_LAUNCHER)

                && (!mUserAspectRatioButtonShownChecker.get() || isShowingButton());

    }

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/UserAspectRatioSettingsWindowManagerTest.java

+29 −7
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.wm.shell.compatui;



import static android.content.Intent.ACTION_MAIN;

import static android.content.Intent.CATEGORY_LAUNCHER;

import static android.hardware.usb.UsbManager.ACTION_USB_STATE;

import static android.view.WindowInsets.Type.navigationBars;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;
@@ -33,6 +36,7 @@ import static org.mockito.Mockito.verify; 
import android.app.ActivityManager;

import android.app.TaskInfo;

import android.content.ComponentName;

import android.content.Intent;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.testing.AndroidTestingRunner;
@@ -108,7 +112,7 @@ public class UserAspectRatioSettingsWindowManagerTest extends ShellTestCase { 
        MockitoAnnotations.initMocks(this);

        mExecutor = new TestShellExecutor();

        mTaskInfo = createTaskInfo(/* eligibleForUserAspectRatioButton= */

                false, /* topActivityBoundsLetterboxed */ true);

                false, /* topActivityBoundsLetterboxed */ true, ACTION_MAIN, CATEGORY_LAUNCHER);

        mWindowManager = new UserAspectRatioSettingsWindowManager(mContext, mTaskInfo,

                mSyncTransactionQueue, mTaskListener, new DisplayLayout(), new CompatUIHintsState(),

                mOnUserAspectRatioSettingsButtonClicked, mExecutor, flags -> 0,
@@ -179,7 +183,7 @@ public class UserAspectRatioSettingsWindowManagerTest extends ShellTestCase { 
        // No diff

        clearInvocations(mWindowManager);

        TaskInfo taskInfo = createTaskInfo(/* eligibleForUserAspectRatioButton= */

                true, /* topActivityBoundsLetterboxed */ true);

                true, /* topActivityBoundsLetterboxed */ true, ACTION_MAIN, CATEGORY_LAUNCHER);

        assertTrue(mWindowManager.updateCompatInfo(taskInfo, mTaskListener, /* canShow= */ true));



        verify(mWindowManager, never()).updateSurfacePosition();
@@ -200,7 +204,24 @@ public class UserAspectRatioSettingsWindowManagerTest extends ShellTestCase { 
        clearInvocations(mWindowManager);

        clearInvocations(mLayout);

        taskInfo = createTaskInfo(/* eligibleForUserAspectRatioButton= */

                false, /* topActivityBoundsLetterboxed */ true);

                false, /* topActivityBoundsLetterboxed */ true, ACTION_MAIN, CATEGORY_LAUNCHER);

        assertFalse(

                mWindowManager.updateCompatInfo(taskInfo, newTaskListener, /* canShow= */ true));

        verify(mWindowManager).release();



        // Recreate button

        clearInvocations(mWindowManager);

        taskInfo = createTaskInfo(/* eligibleForUserAspectRatioButton= */

                true, /* topActivityBoundsLetterboxed */ true, ACTION_MAIN, CATEGORY_LAUNCHER);

        assertTrue(mWindowManager.updateCompatInfo(taskInfo, newTaskListener, /* canShow= */ true));



        verify(mWindowManager).release();

        verify(mWindowManager).createLayout(/* canShow= */ true);



        // Change has no launcher category and is not main intent, dispose the component

        clearInvocations(mWindowManager);

        taskInfo = createTaskInfo(/* eligibleForUserAspectRatioButton= */

                true, /* topActivityBoundsLetterboxed */ true, ACTION_USB_STATE, "");

        assertFalse(

                mWindowManager.updateCompatInfo(taskInfo, newTaskListener, /* canShow= */ true));

        verify(mWindowManager).release();
@@ -217,7 +238,7 @@ public class UserAspectRatioSettingsWindowManagerTest extends ShellTestCase { 
        // inflated

        clearInvocations(mWindowManager);

        TaskInfo taskInfo = createTaskInfo(/* eligibleForUserAspectRatioButton= */

                false, /* topActivityBoundsLetterboxed */ true);

                false, /* topActivityBoundsLetterboxed */ true, ACTION_MAIN, CATEGORY_LAUNCHER);

        mWindowManager.updateCompatInfo(taskInfo, mTaskListener, /* canShow= */ true);



        verify(mWindowManager, never()).inflateLayout();
@@ -225,7 +246,7 @@ public class UserAspectRatioSettingsWindowManagerTest extends ShellTestCase { 
        // Change topActivityInSizeCompat to true and pass canShow true, layout should be inflated.

        clearInvocations(mWindowManager);

        taskInfo = createTaskInfo(/* eligibleForUserAspectRatioButton= */

                true, /* topActivityBoundsLetterboxed */ true);

                true, /* topActivityBoundsLetterboxed */ true, ACTION_MAIN, CATEGORY_LAUNCHER);

        mWindowManager.updateCompatInfo(taskInfo, mTaskListener, /* canShow= */ true);



        verify(mWindowManager).inflateLayout();
@@ -304,7 +325,7 @@ public class UserAspectRatioSettingsWindowManagerTest extends ShellTestCase { 
        clearInvocations(mWindowManager);

        spyOn(mWindowManager);

        TaskInfo taskInfo = createTaskInfo(/* eligibleForUserAspectRatioButton= */

                true, /* topActivityBoundsLetterboxed */ true);

                true, /* topActivityBoundsLetterboxed */ true, ACTION_MAIN, CATEGORY_LAUNCHER);



        // User aspect ratio settings button has not yet been shown.

        doReturn(false).when(mUserAspectRatioButtonShownChecker).get();
@@ -378,7 +399,7 @@ public class UserAspectRatioSettingsWindowManagerTest extends ShellTestCase { 
    }



    private static TaskInfo createTaskInfo(boolean eligibleForUserAspectRatioButton,

            boolean topActivityBoundsLetterboxed) {

            boolean topActivityBoundsLetterboxed, String action, String category) {

        ActivityManager.RunningTaskInfo taskInfo = new ActivityManager.RunningTaskInfo();

        taskInfo.taskId = TASK_ID;

        taskInfo.appCompatTaskInfo.topActivityEligibleForUserAspectRatioButton =
@@ -386,6 +407,7 @@ public class UserAspectRatioSettingsWindowManagerTest extends ShellTestCase { 
        taskInfo.appCompatTaskInfo.topActivityBoundsLetterboxed = topActivityBoundsLetterboxed;

        taskInfo.configuration.uiMode &= ~Configuration.UI_MODE_TYPE_DESK;

        taskInfo.realActivity = new ComponentName("com.mypackage.test", "TestActivity");

        taskInfo.baseIntent = new Intent(action).addCategory(category);

        return taskInfo;

    }

}